diff --git a/InvenTree/InvenTree/static/script/inventree/build.js b/InvenTree/InvenTree/static/script/inventree/build.js
index 0a9250ebb2..aa938ecd53 100644
--- a/InvenTree/InvenTree/static/script/inventree/build.js
+++ b/InvenTree/InvenTree/static/script/inventree/build.js
@@ -1,5 +1,6 @@
 function updateAllocationTotal(id, count, required) {
     
+    count = parseFloat(count);
     
     $('#allocation-total-'+id).html(count);
     
@@ -27,21 +28,24 @@ function loadAllocationTable(table, part_id, part, url, required, button) {
                 field: 'stock_item_detail',
                 title: 'Stock Item',
                 formatter: function(value, row, index, field) {
-                    return '' + value.quantity + ' x ' + value.part_name + ' @ ' + value.location_name;
+                    return '' + parseFloat(value.quantity) + ' x ' + value.part_name + ' @ ' + value.location_name;
                 }
             },
             {
                 field: 'stock_item_detail.quantity',
                 title: 'Available',
+                formatter: function(value, row, index, field) {
+                    return parseFloat(value);
+                }
             },
             {
                 field: 'quantity',
                 title: 'Allocated',
                 formatter: function(value, row, index, field) {
-                    var html = value;
+                    var html = parseFloat(value);
 
-                    var bEdit = "<button class='btn btn-primary item-edit-button btn-sm' type='button' title='Edit stock allocation' url='/build/item/" + row.pk + "/edit/'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>";
-                    var bDel = "<button class='btn btn-danger item-del-button btn-sm' type='button' title='Delete stock allocation' url='/build/item/" + row.pk + "/delete/'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>";
+                    var bEdit = "<button class='btn item-edit-button btn-sm' type='button' title='Edit stock allocation' url='/build/item/" + row.pk + "/edit/'><span class='glyphicon glyphicon-small glyphicon-edit'></span></button>";
+                    var bDel = "<button class='btn item-del-button btn-sm' type='button' title='Delete stock allocation' url='/build/item/" + row.pk + "/delete/'><span class='glyphicon glyphicon-small glyphicon-trash'></span></button>";
                     
                     html += "<div class='btn-group' style='float: right;'>" + bEdit + bDel + "</div>";
                     
diff --git a/InvenTree/InvenTree/static/script/inventree/stock.js b/InvenTree/InvenTree/static/script/inventree/stock.js
index 612c8b5c88..1495d04cae 100644
--- a/InvenTree/InvenTree/static/script/inventree/stock.js
+++ b/InvenTree/InvenTree/static/script/inventree/stock.js
@@ -385,6 +385,9 @@ function loadStockTrackingTable(table, options) {
     cols.push({
         field: 'quantity',
         title: 'Quantity',
+        formatter: function(value, row, index, field) {
+            return parseFloat(value);
+        },
     });
 
     cols.push({
diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py
index b625dde475..f9d3399eae 100644
--- a/InvenTree/build/models.py
+++ b/InvenTree/build/models.py
@@ -20,6 +20,7 @@ from markdownx.models import MarkdownxField
 
 from InvenTree.status_codes import BuildStatus
 from InvenTree.fields import InvenTreeURLField
+from InvenTree.helpers import decimal2string
 
 from stock.models import StockItem
 from part.models import Part, BomItem
@@ -42,7 +43,7 @@ class Build(models.Model):
     """
 
     def __str__(self):
-        return "Build {q} x {part}".format(q=self.quantity, part=str(self.part))
+        return "Build {q} x {part}".format(q=decimal2string(self.quantity), part=str(self.part))
 
     def get_absolute_url(self):
         return reverse('build-detail', kwargs={'pk': self.id})
diff --git a/InvenTree/build/templates/build/allocation_item.html b/InvenTree/build/templates/build/allocation_item.html
index 7339f7aff4..87b6ba1340 100644
--- a/InvenTree/build/templates/build/allocation_item.html
+++ b/InvenTree/build/templates/build/allocation_item.html
@@ -15,7 +15,7 @@
 
 {% block collapse_heading %}
     <div class='col-sm-2'>
-        <b>{{ item.sub_part.total_stock }}</b>
+        <b>{% decimal item.sub_part.total_stock %}</b>
     </div>
     <div class='col-sm-2'>
         <b>{% multiply build.quantity item.quantity %}</b>
diff --git a/InvenTree/build/templates/build/delete_build_item.html b/InvenTree/build/templates/build/delete_build_item.html
index 37ed0dfa32..f9c41b9eb5 100644
--- a/InvenTree/build/templates/build/delete_build_item.html
+++ b/InvenTree/build/templates/build/delete_build_item.html
@@ -1,7 +1,9 @@
 {% extends "modal_delete_form.html" %}
+{% load i18n %}
+{% load inventree_extras %}
 
 {% block pre_form_content %}
-Are you sure you want to unallocate these parts?
+{% trans "Are you sure you want to unallocate these parts?" %}
 <br>
-This will remove {{ item.quantity }} parts from build '{{ item.build.title }}'.
+This will remove {% decimal item.quantity %} parts from build '{{ item.build.title }}'.
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/build/templates/build/unallocate.html b/InvenTree/build/templates/build/unallocate.html
index 503bc354f6..f6543b3732 100644
--- a/InvenTree/build/templates/build/unallocate.html
+++ b/InvenTree/build/templates/build/unallocate.html
@@ -1,9 +1,10 @@
 {% extends "modal_form.html" %}
-
+{% load i18n %}
+{% load inventree_extras %}
 {% block pre_form_content %}
 
 {{ block.super }}
 
-Are you sure you wish to unallocate all stock for this build?
+{% trans "Are you sure you wish to unallocate all stock for this build?" %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py
index 6a09a3234e..feda6ee9eb 100644
--- a/InvenTree/build/views.py
+++ b/InvenTree/build/views.py
@@ -53,7 +53,7 @@ class BuildCancel(AjaxUpdateView):
 
     model = Build
     ajax_template_name = 'build/cancel.html'
-    ajax_form_title = 'Cancel Build'
+    ajax_form_title = _('Cancel Build')
     context_object_name = 'build'
     form_class = forms.CancelBuildForm
 
@@ -71,12 +71,12 @@ class BuildCancel(AjaxUpdateView):
         if confirm:
             build.cancelBuild(request.user)
         else:
-            form.errors['confirm_cancel'] = ['Confirm build cancellation']
+            form.errors['confirm_cancel'] = [_('Confirm build cancellation')]
             valid = False
 
         data = {
             'form_valid': valid,
-            'danger': 'Build was cancelled'
+            'danger': _('Build was cancelled')
         }
 
         return self.renderJsonResponse(request, form, data=data)
@@ -92,7 +92,7 @@ class BuildAutoAllocate(AjaxUpdateView):
     model = Build
     form_class = forms.ConfirmBuildForm
     context_object_name = 'build'
-    ajax_form_title = 'Allocate Stock'
+    ajax_form_title = _('Allocate Stock')
     ajax_template_name = 'build/auto_allocate.html'
 
     def get_context_data(self, *args, **kwargs):
@@ -105,7 +105,7 @@ class BuildAutoAllocate(AjaxUpdateView):
             context['build'] = build
             context['allocations'] = build.getAutoAllocations()
         except Build.DoesNotExist:
-            context['error'] = 'No matching build found'
+            context['error'] = _('No matching build found')
 
         return context
 
@@ -124,8 +124,8 @@ class BuildAutoAllocate(AjaxUpdateView):
         valid = False
 
         if confirm is False:
-            form.errors['confirm'] = ['Confirm stock allocation']
-            form.non_field_errors = 'Check the confirmation box at the bottom of the list'
+            form.errors['confirm'] = [_('Confirm stock allocation')]
+            form.non_field_errors = _('Check the confirmation box at the bottom of the list')
         else:
             build.autoAllocate()
             valid = True
@@ -145,7 +145,7 @@ class BuildUnallocate(AjaxUpdateView):
 
     model = Build
     form_class = forms.ConfirmBuildForm
-    ajax_form_title = "Unallocate Stock"
+    ajax_form_title = _("Unallocate Stock")
     ajax_template_name = "build/unallocate.html"
 
     def post(self, request, *args, **kwargs):
@@ -158,8 +158,8 @@ class BuildUnallocate(AjaxUpdateView):
         valid = False
 
         if confirm is False:
-            form.errors['confirm'] = ['Confirm unallocation of build stock']
-            form.non_field_errors = 'Check the confirmation box'
+            form.errors['confirm'] = [_('Confirm unallocation of build stock')]
+            form.non_field_errors = _('Check the confirmation box')
         else:
             build.unallocateStock()
             valid = True
@@ -182,7 +182,7 @@ class BuildComplete(AjaxUpdateView):
     model = Build
     form_class = forms.CompleteBuildForm
     context_object_name = "build"
-    ajax_form_title = "Complete Build"
+    ajax_form_title = _("Complete Build")
     ajax_template_name = "build/complete.html"
 
     def get_form(self):
@@ -255,14 +255,14 @@ class BuildComplete(AjaxUpdateView):
 
         if confirm is False:
             form.errors['confirm'] = [
-                'Confirm completion of build',
+                _('Confirm completion of build'),
             ]
         else:
             try:
                 location = StockLocation.objects.get(id=loc_id)
                 valid = True
             except StockLocation.DoesNotExist:
-                form.errors['location'] = ['Invalid location selected']
+                form.errors['location'] = [_('Invalid location selected')]
 
             serials = []
 
@@ -306,7 +306,7 @@ class BuildComplete(AjaxUpdateView):
     def get_data(self):
         """ Provide feedback data back to the form """
         return {
-            'info': 'Build marked as COMPLETE'
+            'info': _('Build marked as COMPLETE')
         }
 
 
@@ -382,7 +382,7 @@ class BuildCreate(AjaxCreateView):
     model = Build
     context_object_name = 'build'
     form_class = forms.EditBuildForm
-    ajax_form_title = 'Start new Build'
+    ajax_form_title = _('Start new Build')
     ajax_template_name = 'modal_form.html'
 
     def get_initial(self):
@@ -405,7 +405,7 @@ class BuildCreate(AjaxCreateView):
 
     def get_data(self):
         return {
-            'success': 'Created new build',
+            'success': _('Created new build'),
         }
 
 
@@ -415,12 +415,12 @@ class BuildUpdate(AjaxUpdateView):
     model = Build
     form_class = forms.EditBuildForm
     context_object_name = 'build'
-    ajax_form_title = 'Edit Build Details'
+    ajax_form_title = _('Edit Build Details')
     ajax_template_name = 'modal_form.html'
 
     def get_data(self):
         return {
-            'info': 'Edited build',
+            'info': _('Edited build'),
         }
 
 
@@ -429,7 +429,7 @@ class BuildDelete(AjaxDeleteView):
 
     model = Build
     ajax_template_name = 'build/delete_build.html'
-    ajax_form_title = 'Delete Build'
+    ajax_form_title = _('Delete Build')
 
 
 class BuildItemDelete(AjaxDeleteView):
@@ -439,12 +439,12 @@ class BuildItemDelete(AjaxDeleteView):
 
     model = BuildItem
     ajax_template_name = 'build/delete_build_item.html'
-    ajax_form_title = 'Unallocate Stock'
+    ajax_form_title = _('Unallocate Stock')
     context_object_name = 'item'
 
     def get_data(self):
         return {
-            'danger': 'Removed parts from build allocation'
+            'danger': _('Removed parts from build allocation')
         }
 
 
@@ -454,7 +454,7 @@ class BuildItemCreate(AjaxCreateView):
     model = BuildItem
     form_class = forms.EditBuildItemForm
     ajax_template_name = 'build/create_build_item.html'
-    ajax_form_title = 'Allocate new Part'
+    ajax_form_title = _('Allocate new Part')
 
     part = None
     available_stock = None
@@ -570,11 +570,11 @@ class BuildItemEdit(AjaxUpdateView):
     model = BuildItem
     ajax_template_name = 'modal_form.html'
     form_class = forms.EditBuildItemForm
-    ajax_form_title = 'Edit Stock Allocation'
+    ajax_form_title = _('Edit Stock Allocation')
 
     def get_data(self):
         return {
-            'info': 'Updated Build Item',
+            'info': _('Updated Build Item'),
         }
 
     def get_form(self):
diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py
index 9e72818a36..5da634c6d3 100644
--- a/InvenTree/common/views.py
+++ b/InvenTree/common/views.py
@@ -5,6 +5,8 @@ Django views for interacting with common models
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from django.utils.translation import ugettext as _
+
 from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView
 
 from . import models
@@ -16,7 +18,7 @@ class CurrencyCreate(AjaxCreateView):
 
     model = models.Currency
     form_class = forms.CurrencyEditForm
-    ajax_form_title = 'Create new Currency'
+    ajax_form_title = _('Create new Currency')
 
 
 class CurrencyEdit(AjaxUpdateView):
@@ -24,12 +26,12 @@ class CurrencyEdit(AjaxUpdateView):
 
     model = models.Currency
     form_class = forms.CurrencyEditForm
-    ajax_form_title = 'Edit Currency'
+    ajax_form_title = _('Edit Currency')
 
 
 class CurrencyDelete(AjaxDeleteView):
     """ View for deleting an existing Currency object """
 
     model = models.Currency
-    ajax_form_title = 'Delete Currency'
+    ajax_form_title = _('Delete Currency')
     ajax_template_name = "common/delete_currency.html"
diff --git a/InvenTree/company/views.py b/InvenTree/company/views.py
index 0fa7a2c712..24bce08bc9 100644
--- a/InvenTree/company/views.py
+++ b/InvenTree/company/views.py
@@ -6,6 +6,7 @@ Django views for interacting with Company app
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
+from django.utils.translation import ugettext as _
 from django.views.generic import DetailView, ListView, UpdateView
 
 from django.urls import reverse
@@ -93,12 +94,12 @@ class CompanyImage(AjaxUpdateView):
     """ View for uploading an image for the Company """
     model = Company
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Update Company Image'
+    ajax_form_title = _('Update Company Image')
     form_class = CompanyImageForm
 
     def get_data(self):
         return {
-            'success': 'Updated company image',
+            'success': _('Updated company image'),
         }
 
 
@@ -108,11 +109,11 @@ class CompanyEdit(AjaxUpdateView):
     form_class = EditCompanyForm
     context_object_name = 'company'
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Edit Company'
+    ajax_form_title = _('Edit Company')
 
     def get_data(self):
         return {
-            'info': 'Edited company information',
+            'info': _('Edited company information'),
         }
 
 
@@ -122,11 +123,11 @@ class CompanyCreate(AjaxCreateView):
     context_object_name = 'company'
     form_class = EditCompanyForm
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = "Create new Company"
+    ajax_form_title = _("Create new Company")
 
     def get_data(self):
         return {
-            'success': "Created new company",
+            'success': _("Created new company"),
         }
 
 
@@ -136,12 +137,12 @@ class CompanyDelete(AjaxDeleteView):
     model = Company
     success_url = '/company/'
     ajax_template_name = 'company/delete.html'
-    ajax_form_title = 'Delete Company'
+    ajax_form_title = _('Delete Company')
     context_object_name = 'company'
 
     def get_data(self):
         return {
-            'danger': 'Company was deleted',
+            'danger': _('Company was deleted'),
         }
 
 
@@ -166,7 +167,7 @@ class SupplierPartEdit(AjaxUpdateView):
     context_object_name = 'part'
     form_class = EditSupplierPartForm
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Edit Supplier Part'
+    ajax_form_title = _('Edit Supplier Part')
 
 
 class SupplierPartCreate(AjaxCreateView):
@@ -175,7 +176,7 @@ class SupplierPartCreate(AjaxCreateView):
     model = SupplierPart
     form_class = EditSupplierPartForm
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Create new Supplier Part'
+    ajax_form_title = _('Create new Supplier Part')
     context_object_name = 'part'
 
     def get_form(self):
@@ -232,7 +233,7 @@ class SupplierPartDelete(AjaxDeleteView):
 
     success_url = '/supplier/'
     ajax_template_name = 'company/partdelete.html'
-    ajax_form_title = 'Delete Supplier Part'
+    ajax_form_title = _('Delete Supplier Part')
 
     parts = []
 
@@ -302,7 +303,7 @@ class PriceBreakCreate(AjaxCreateView):
 
     model = SupplierPriceBreak
     form_class = EditPriceBreakForm
-    ajax_form_title = 'Add Price Break'
+    ajax_form_title = _('Add Price Break')
     ajax_template_name = 'modal_form.html'
 
     def get_data(self):
@@ -337,7 +338,7 @@ class PriceBreakEdit(AjaxUpdateView):
 
     model = SupplierPriceBreak
     form_class = EditPriceBreakForm
-    ajax_form_title = 'Edit Price Break'
+    ajax_form_title = _('Edit Price Break')
     ajax_template_name = 'modal_form.html'
 
     def get_form(self):
@@ -352,5 +353,5 @@ class PriceBreakDelete(AjaxDeleteView):
     """ View for deleting a supplier price break """
 
     model = SupplierPriceBreak
-    ajax_form_title = "Delete Price Break"
+    ajax_form_title = _("Delete Price Break")
     ajax_template_name = 'modal_delete_form.html'
diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index fc53b0aed0..8547621b0d 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-10 11:09+0000\n"
+"POT-Creation-Date: 2020-02-11 23:25+0000\n"
 "PO-Revision-Date: 2020-02-02 08:07+0100\n"
 "Last-Translator: Christian Schlüter <chschlue@gmail.com>\n"
 "Language-Team: C <kde-i18n-doc@kde.org>\n"
@@ -105,7 +105,7 @@ msgstr "Zerstört"
 
 #: InvenTree/status_codes.py:92 build/templates/build/allocate_edit.html:28
 #: build/templates/build/allocate_view.html:21
-#: part/templates/part/part_base.html:116 part/templates/part/tabs.html:21
+#: part/templates/part/part_base.html:106 part/templates/part/tabs.html:21
 msgid "Allocated"
 msgstr "Zugeordnet"
 
@@ -150,15 +150,15 @@ msgstr "Eindeutige Seriennummern eingeben (oder leer lassen)"
 msgid "Confirm build completion"
 msgstr "Bau-Fertigstellung bestätigen"
 
-#: build/models.py:53
+#: build/models.py:54
 msgid "Brief description of the build"
 msgstr "Kurze Beschreibung des Baus"
 
-#: build/models.py:62
+#: build/models.py:63
 msgid "Select part to build"
 msgstr "Teil für den Bau wählen"
 
-#: build/models.py:68
+#: build/models.py:69
 msgid ""
 "Select location to take stock from for this build (leave blank to take from "
 "any stock location)"
@@ -166,46 +166,46 @@ msgstr ""
 "Lager-Entnahmestandort für diesen Bau wählen (oder leer lassen für einen "
 "beliebigen Lager-Standort)"
 
-#: build/models.py:74
+#: build/models.py:75
 msgid "Number of parts to build"
 msgstr "Anzahl der zu bauenden Teile"
 
-#: build/models.py:80
+#: build/models.py:81
 msgid "Build status"
 msgstr "Bau-Status"
 
-#: build/models.py:83
+#: build/models.py:84
 msgid "Batch code for this build output"
 msgstr "Chargennummer für diese Bau-Ausgabe"
 
-#: build/models.py:95
+#: build/models.py:96
 msgid "Link to external URL"
 msgstr "Link zu einer externen URL"
 
-#: build/models.py:97
+#: build/models.py:98
 msgid "Extra build notes"
 msgstr "Notizen für den Bau"
 
-#: build/models.py:382
+#: build/models.py:383
 #, python-brace-format
 msgid "Selected stock item not found in BOM for part '{p}'"
 msgstr "Ausgewähltes Lagerobjekt nicht in BOM für Teil '{p}' gefunden"
 
-#: build/models.py:385
+#: build/models.py:386
 #, python-brace-format
 msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
 msgstr ""
 "zugewiesene Anzahl ({n}) darf nicht die verfügbare ({q}) Anzahl überschreiten"
 
-#: build/models.py:403
+#: build/models.py:404
 msgid "Build to allocate parts"
 msgstr "Bau starten um Teile zuzuweisen"
 
-#: build/models.py:410
+#: build/models.py:411
 msgid "Stock Item to allocate to build"
 msgstr "Lagerobjekt dem Bau zuweisen"
 
-#: build/models.py:418
+#: build/models.py:419
 msgid "Stock quantity to allocate to build"
 msgstr "Lagerobjekt-Anzahl dem Bau zuweisen"
 
@@ -248,7 +248,7 @@ msgid "Allocate"
 msgstr "zuweisen"
 
 #: build/templates/build/allocate_view.html:10
-#: company/templates/company/detail_part.html:18
+#: company/templates/company/detail_part.html:18 order/views.py:448
 msgid "Order Parts"
 msgstr "Teile bestellen"
 
@@ -261,10 +261,17 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: build/templates/build/allocate_view.html:22
-#: part/templates/part/part_base.html:122
+#: part/templates/part/part_base.html:112
 msgid "On Order"
 msgstr "bestellt"
 
+#: build/templates/build/delete_build_item.html:6
+#, fuzzy
+#| msgid "Are you sure you want to delete the following Supplier Parts?"
+msgid "Are you sure you want to unallocate these parts?"
+msgstr ""
+"Sind Sie sicher, dass sie die folgenden Zulieferer-Teile löschen möchten?"
+
 #: build/templates/build/detail.html:8
 msgid "Build Details"
 msgstr "Bau-Status"
@@ -302,7 +309,7 @@ msgstr "Los"
 #: build/templates/build/detail.html:42
 #: company/templates/company/detail_part.html:90
 #: company/templates/company/partdetail.html:54
-#: part/templates/part/detail.html:50 part/templates/part/part_base.html:91
+#: part/templates/part/detail.html:50 part/templates/part/part_base.html:81
 #: stock/templates/stock/item_base.html:120
 msgid "URL"
 msgstr "URL"
@@ -359,11 +366,135 @@ msgstr "Notizen"
 msgid "Assign Parts"
 msgstr "Teile zuweisen"
 
+#: build/templates/build/unallocate.html:8
+msgid "Are you sure you wish to unallocate all stock for this build?"
+msgstr ""
+
+#: build/views.py:56
+#, fuzzy
+#| msgid "Can Build"
+msgid "Cancel Build"
+msgstr "Herstellbar?"
+
+#: build/views.py:74
+#, fuzzy
+#| msgid "Confirm order cancellation"
+msgid "Confirm build cancellation"
+msgstr "Bestell-Stornierung bestätigen"
+
+#: build/views.py:79
+msgid "Build was cancelled"
+msgstr ""
+
+#: build/views.py:95
+#, fuzzy
+#| msgid "Allocate Stock to Build"
+msgid "Allocate Stock"
+msgstr "Lagerbestand dem Bau zuweisen"
+
+#: build/views.py:108
+msgid "No matching build found"
+msgstr ""
+
+#: build/views.py:127
+#, fuzzy
+#| msgid "Confirm order cancellation"
+msgid "Confirm stock allocation"
+msgstr "Bestell-Stornierung bestätigen"
+
+#: build/views.py:128
+msgid "Check the confirmation box at the bottom of the list"
+msgstr ""
+
+#: build/views.py:148 build/views.py:442
+#, fuzzy
+#| msgid "Unallocate"
+msgid "Unallocate Stock"
+msgstr "Zuweisung aufheben"
+
+#: build/views.py:161
+msgid "Confirm unallocation of build stock"
+msgstr ""
+
+#: build/views.py:162
+msgid "Check the confirmation box"
+msgstr ""
+
+#: build/views.py:185
+#, fuzzy
+#| msgid "Completed"
+msgid "Complete Build"
+msgstr "Fertig"
+
+#: build/views.py:258
+#, fuzzy
+#| msgid "Confirm build completion"
+msgid "Confirm completion of build"
+msgstr "Bau-Fertigstellung bestätigen"
+
+#: build/views.py:265
+#, fuzzy
+#| msgid "Invalid part selection"
+msgid "Invalid location selected"
+msgstr "Ungültige Teileauswahl"
+
 #: build/views.py:290 stock/views.py:884
 #, python-brace-format
 msgid "The following serial numbers already exist: ({sn})"
 msgstr "Die folgende Seriennummer existiert bereits: ({sn})"
 
+#: build/views.py:309
+msgid "Build marked as COMPLETE"
+msgstr ""
+
+#: build/views.py:385
+#, fuzzy
+#| msgid "Can Build"
+msgid "Start new Build"
+msgstr "Herstellbar?"
+
+#: build/views.py:408
+#, fuzzy
+#| msgid "Created new stock item"
+msgid "Created new build"
+msgstr "Neues Lagerobjekt erstellt"
+
+#: build/views.py:418
+#, fuzzy
+#| msgid "Build Details"
+msgid "Edit Build Details"
+msgstr "Bau-Status"
+
+#: build/views.py:423
+msgid "Edited build"
+msgstr ""
+
+#: build/views.py:432
+msgid "Delete Build"
+msgstr ""
+
+#: build/views.py:447
+#, fuzzy
+#| msgid "Receive parts to this location"
+msgid "Removed parts from build allocation"
+msgstr "Teile in diesen Ort empfangen"
+
+#: build/views.py:457
+#, fuzzy
+#| msgid "Create new Stock Item"
+msgid "Allocate new Part"
+msgstr "Neues Lagerobjekt hinzufügen"
+
+#: build/views.py:573
+#, fuzzy
+#| msgid "Edit Stock Location"
+msgid "Edit Stock Allocation"
+msgstr "Lagerobjekt-Standort bearbeiten"
+
+#: build/views.py:577
+msgid "Updated Build Item"
+msgstr ""
+
 #: common/models.py:69
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
@@ -402,6 +533,20 @@ msgstr "Währungs-Wert"
 msgid "Use this currency as the base currency"
 msgstr "Benutze diese Währung als Basis-Währung"
 
+#: common/views.py:21
+#, fuzzy
+#| msgid "Create new Stock Item"
+msgid "Create new Currency"
+msgstr "Neues Lagerobjekt hinzufügen"
+
+#: common/views.py:29
+msgid "Edit Currency"
+msgstr ""
+
+#: common/views.py:36
+msgid "Delete Currency"
+msgstr ""
+
 #: company/models.py:74
 msgid "Company name"
 msgstr "Firmenname"
@@ -674,6 +819,84 @@ msgstr "Lagerbestand"
 msgid "Sales Orders"
 msgstr "Bestellungen"
 
+#: company/views.py:97
+#, fuzzy
+#| msgid "Company name"
+msgid "Update Company Image"
+msgstr "Firmenname"
+
+#: company/views.py:102
+msgid "Updated company image"
+msgstr ""
+
+#: company/views.py:112
+#, fuzzy
+#| msgid "Company"
+msgid "Edit Company"
+msgstr "Firma"
+
+#: company/views.py:116
+#, fuzzy
+#| msgid "Link to external company information"
+msgid "Edited company information"
+msgstr "Link auf externe Firmeninformation"
+
+#: company/views.py:126
+#, fuzzy
+#| msgid "Create new Stock Item"
+msgid "Create new Company"
+msgstr "Neues Lagerobjekt hinzufügen"
+
+#: company/views.py:130
+#, fuzzy
+#| msgid "Created new stock item"
+msgid "Created new company"
+msgstr "Neues Lagerobjekt erstellt"
+
+#: company/views.py:140
+#, fuzzy
+#| msgid "Company"
+msgid "Delete Company"
+msgstr "Firma"
+
+#: company/views.py:145
+#, fuzzy
+#| msgid "Company address"
+msgid "Company was deleted"
+msgstr "Firmenadresse"
+
+#: company/views.py:170
+#, fuzzy
+#| msgid "Supplier Part"
+msgid "Edit Supplier Part"
+msgstr "Zulieferer-Teil"
+
+#: company/views.py:179
+#, fuzzy
+#| msgid "Supplier Part"
+msgid "Create new Supplier Part"
+msgstr "Zulieferer-Teil"
+
+#: company/views.py:236
+#, fuzzy
+#| msgid "Supplier Part"
+msgid "Delete Supplier Part"
+msgstr "Zulieferer-Teil"
+
+#: company/views.py:306
+msgid "Add Price Break"
+msgstr ""
+
+#: company/views.py:341
+msgid "Edit Price Break"
+msgstr ""
+
+#: company/views.py:356
+#, fuzzy
+#| msgid "Delete attachment"
+msgid "Delete Price Break"
+msgstr "Anhang löschen"
+
 #: order/forms.py:21
 msgid "Place order"
 msgstr "Bestellung aufgeben"
@@ -706,7 +929,7 @@ msgstr "Link auf externe Seite"
 msgid "Order notes"
 msgstr "Bestell-Notizen"
 
-#: order/models.py:159 order/models.py:210 part/views.py:1080
+#: order/models.py:159 order/models.py:210 part/views.py:1109
 #: stock/models.py:440
 msgid "Quantity must be greater than zero"
 msgstr "Anzahl muss größer Null sein"
@@ -761,7 +984,7 @@ msgstr "Empfangen"
 msgid "Order Notes"
 msgstr "Bestellungsbemerkungen"
 
-#: order/templates/order/purchase_order_detail.html:15
+#: order/templates/order/purchase_order_detail.html:15 order/views.py:747
 msgid "Add Line Item"
 msgstr "Position hinzufügen"
 
@@ -785,14 +1008,50 @@ msgstr "Referenz"
 msgid "Items"
 msgstr "Positionen"
 
+#: order/views.py:99
+#, fuzzy
+#| msgid "Purchase Order"
+msgid "Create Purchase Order"
+msgstr "Kaufvertrag"
+
+#: order/views.py:129
+#, fuzzy
+#| msgid "Purchase Order"
+msgid "Edit Purchase Order"
+msgstr "Kaufvertrag"
+
+#: order/views.py:149
+#, fuzzy
+#| msgid "Cancel order"
+msgid "Cancel Order"
+msgstr "Bestellung stornieren"
+
 #: order/views.py:164
 msgid "Confirm order cancellation"
 msgstr "Bestell-Stornierung bestätigen"
 
+#: order/views.py:182
+#, fuzzy
+#| msgid "Issued"
+msgid "Issue Order"
+msgstr "Aufgegeben"
+
 #: order/views.py:197
 msgid "Confirm order placement"
 msgstr "Bestellungstätigung bestätigen"
 
+#: order/views.py:218
+#, fuzzy
+#| msgid "Completed"
+msgid "Complete Order"
+msgstr "Fertig"
+
+#: order/views.py:284
+#, fuzzy
+#| msgid "Required Parts"
+msgid "Receive Parts"
+msgstr "benötigte Teile"
+
 #: order/views.py:351
 msgid "Items received"
 msgstr "Anzahl empfangener Positionen"
@@ -825,224 +1084,258 @@ msgstr "Zulieferer muss zum Teil und zur Bestellung passen"
 msgid "Invalid SupplierPart selection"
 msgstr "Ungültige Wahl des Zulieferer-Teils"
 
-#: part/bom.py:107
+#: order/views.py:862
+#, fuzzy
+#| msgid "Add Line Item"
+msgid "Edit Line Item"
+msgstr "Position hinzufügen"
+
+#: order/views.py:878
+#, fuzzy
+#| msgid "Delete Stock Item"
+msgid "Delete Line Item"
+msgstr "Lagerobjekt löschen"
+
+#: order/views.py:883
+#, fuzzy
+#| msgid "Deleted {n} stock items"
+msgid "Deleted line item"
+msgstr "{n} Teile im Lager gelöscht"
+
+#: part/bom.py:140
 #, python-brace-format
 msgid "Unsupported file format: {f}"
 msgstr "Nicht unterstütztes Dateiformat: {f}"
 
-#: part/bom.py:112
+#: part/bom.py:145
 msgid "Error reading BOM file (invalid data)"
 msgstr "Fehler beim Lesen der Stückliste (ungültige Daten)"
 
-#: part/bom.py:114
+#: part/bom.py:147
 msgid "Error reading BOM file (incorrect row size)"
 msgstr "Fehler beim Lesen der Stückliste (ungültige Zeilengröße)"
 
-#: part/forms.py:37
+#: part/forms.py:37 stock/forms.py:91
+msgid "File Format"
+msgstr "Dateiformat"
+
+#: part/forms.py:37 stock/forms.py:91
+msgid "Select output file format"
+msgstr "Ausgabe-Dateiformat auswählen"
+
+#: part/forms.py:39
+msgid "Cascading"
+msgstr ""
+
+#: part/forms.py:39
+msgid "Download cascading / multi-level BOM"
+msgstr ""
+
+#: part/forms.py:58
 msgid "Confirm that the BOM is correct"
 msgstr "Bestätigen, dass die Stückliste korrekt ist"
 
-#: part/forms.py:49
+#: part/forms.py:70
 msgid "Select BOM file to upload"
 msgstr "Stücklisten-Datei zum Upload auswählen"
 
-#: part/forms.py:73
+#: part/forms.py:94
 msgid "Select part category"
 msgstr "Teilekategorie wählen"
 
-#: part/forms.py:81
+#: part/forms.py:102
 msgid "Perform 'deep copy' which will duplicate all BOM data for this part"
 msgstr ""
 "Tiefe Kopie ausführen. Dies wird alle Daten der Stückliste für dieses Teil "
 "duplizieren"
 
-#: part/forms.py:86
+#: part/forms.py:107
 msgid "Confirm part creation"
 msgstr "Erstellen des Teils bestätigen"
 
-#: part/forms.py:172
+#: part/forms.py:193
 msgid "Input quantity for price calculation"
 msgstr "Eintragsmenge zur Preisberechnung"
 
-#: part/forms.py:175
+#: part/forms.py:196
 msgid "Select currency for price calculation"
 msgstr "Währung zur Preisberechnung wählen"
 
-#: part/models.py:57
+#: part/models.py:59
 msgid "Default location for parts in this category"
 msgstr "Standard-Standort für Teile dieser Kategorie"
 
-#: part/models.py:60
+#: part/models.py:62
 msgid "Default keywords for parts in this category"
 msgstr "Standard-Stichworte für Teile dieser Kategorie"
 
-#: part/models.py:309
+#: part/models.py:323
 msgid "Part must be unique for name, IPN and revision"
 msgstr "Namen, Teile- und Revisionsnummern müssen eindeutig sein"
 
-#: part/models.py:323
+#: part/models.py:337
 msgid "Part cannot be a template part if it is a variant of another part"
 msgstr "Teil kann keine Vorlage sein wenn es Variante eines anderen Teils ist"
 
-#: part/models.py:324
+#: part/models.py:338
 msgid "Part cannot be a variant of another part if it is already a template"
 msgstr ""
 "Teil kann keine Variante eines anderen Teils sein wenn es bereits eine "
 "Vorlage ist"
 
-#: part/models.py:328 part/templates/part/detail.html:17
+#: part/models.py:342 part/templates/part/detail.html:17
 msgid "Part name"
 msgstr "Name des Teils"
 
-#: part/models.py:332
+#: part/models.py:346
 msgid "Is this part a template part?"
 msgstr "Ist dieses Teil eine Vorlage?"
 
-#: part/models.py:341
+#: part/models.py:355
 msgid "Is this part a variant of another part?"
 msgstr "Ist dieses Teil eine Variante eines anderen Teils?"
 
-#: part/models.py:343
+#: part/models.py:357
 msgid "Part description"
 msgstr "Beschreibung des Teils"
 
-#: part/models.py:345
+#: part/models.py:359
 msgid "Part keywords to improve visibility in search results"
 msgstr "Schlüsselworte um die Sichtbarkeit in Suchergebnissen zu verbessern"
 
-#: part/models.py:350
+#: part/models.py:364
 msgid "Part category"
 msgstr "Teile-Kategorie"
 
-#: part/models.py:352
+#: part/models.py:366
 msgid "Internal Part Number"
 msgstr "Interne Teilenummer"
 
-#: part/models.py:354
+#: part/models.py:368
 msgid "Part revision or version number"
 msgstr "Revisions- oder Versionsnummer"
 
-#: part/models.py:356
+#: part/models.py:370
 msgid "Link to extenal URL"
 msgstr "Link zu einer Externen URL"
 
-#: part/models.py:362
+#: part/models.py:376
 msgid "Where is this item normally stored?"
 msgstr "Wo wird dieses Teil normalerweise gelagert?"
 
-#: part/models.py:406
+#: part/models.py:420
 msgid "Default supplier part"
 msgstr "Standard-Zulieferer?"
 
-#: part/models.py:409
+#: part/models.py:423
 msgid "Minimum allowed stock level"
 msgstr "Minimal zulässiger Lagerbestand"
 
-#: part/models.py:411
+#: part/models.py:425
 msgid "Stock keeping units for this part"
 msgstr "Stock Keeping Units (SKU) für dieses Teil"
 
-#: part/models.py:413
+#: part/models.py:427
 msgid "Can this part be built from other parts?"
 msgstr "Kann dieses Teil aus anderen Teilen angefertigt werden?"
 
-#: part/models.py:415
+#: part/models.py:429
 msgid "Can this part be used to build other parts?"
 msgstr "Kann dieses Teil zum Bau von anderen genutzt werden?"
 
-#: part/models.py:417
+#: part/models.py:431
 msgid "Does this part have tracking for unique items?"
 msgstr "Hat dieses Teil Tracking für einzelne Objekte?"
 
-#: part/models.py:419
+#: part/models.py:433
 msgid "Can this part be purchased from external suppliers?"
 msgstr "Kann dieses Teil von externen Zulieferern gekauft werden?"
 
-#: part/models.py:421
+#: part/models.py:435
 msgid "Can this part be sold to customers?"
 msgstr "Kann dieses Teil an Kunden verkauft werden?"
 
-#: part/models.py:423
+#: part/models.py:437
 msgid "Is this part active?"
 msgstr "Ist dieses Teil aktiv?"
 
-#: part/models.py:425
+#: part/models.py:439
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr "Ist dieses Teil virtuell, wie zum Beispiel eine Software oder Lizenz?"
 
-#: part/models.py:427
+#: part/models.py:441
 msgid "Part notes - supports Markdown formatting"
 msgstr "Bemerkungen - unterstüzt Markdown-Formatierung"
 
-#: part/models.py:429
+#: part/models.py:443
 msgid "Stored BOM checksum"
 msgstr "Prüfsumme der Stückliste gespeichert"
 
-#: part/models.py:936
+#: part/models.py:948
 msgid "Select file to attach"
 msgstr "Datei zum Anhängen auswählen"
 
-#: part/models.py:938
+#: part/models.py:950
 msgid "File comment"
 msgstr "Datei-Kommentar"
 
-#: part/models.py:993
+#: part/models.py:1005
 msgid "Parameter template name must be unique"
 msgstr "Vorlagen-Name des Parameters muss eindeutig sein"
 
-#: part/models.py:998
+#: part/models.py:1010
 msgid "Parameter Name"
 msgstr "Name des Parameters"
 
-#: part/models.py:1000
+#: part/models.py:1012
 msgid "Parameter Units"
 msgstr "Parameter Einheit"
 
-#: part/models.py:1026
+#: part/models.py:1038
 msgid "Parent Part"
 msgstr "Ausgangsteil"
 
-#: part/models.py:1028
+#: part/models.py:1040
 msgid "Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/models.py:1030
+#: part/models.py:1042
 msgid "Parameter Value"
 msgstr "Parameter Wert"
 
-#: part/models.py:1054
+#: part/models.py:1066
 msgid "Select parent part"
 msgstr "Ausgangsteil auswählen"
 
-#: part/models.py:1062
+#: part/models.py:1074
 msgid "Select part to be used in BOM"
 msgstr "Teil für die Nutzung in der Stückliste auswählen"
 
-#: part/models.py:1068
+#: part/models.py:1080
 msgid "BOM quantity for this BOM item"
 msgstr "Stücklisten-Anzahl für dieses Stücklisten-Teil"
 
-#: part/models.py:1071
+#: part/models.py:1083
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr "Geschätzter Ausschuss (absolut oder prozentual)"
 
-#: part/models.py:1074
+#: part/models.py:1086
 msgid "BOM item reference"
 msgstr "Referenz des Objekts auf der Stückliste"
 
-#: part/models.py:1077
+#: part/models.py:1089
 msgid "BOM item notes"
 msgstr "Notizen zum Stücklisten-Objekt"
 
-#: part/models.py:1079
+#: part/models.py:1091
 msgid "BOM line checksum"
 msgstr "Prüfsumme der Stückliste"
 
-#: part/models.py:1142
+#: part/models.py:1154
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr "Teil kann nicht zu seiner eigenen Stückliste hinzugefügt werden"
 
-#: part/models.py:1149
+#: part/models.py:1161
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr "Teil '{p1}' wird in Stückliste für Teil '{p2}' benutzt (rekursiv)"
@@ -1063,7 +1356,7 @@ msgstr "Datei"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: part/templates/part/attachments.html:34
+#: part/templates/part/attachments.html:34 part/views.py:118
 msgid "Edit attachment"
 msgstr "Anhang bearbeiten"
 
@@ -1112,7 +1405,7 @@ msgstr "Teile (inklusive Unter-Kategorien)"
 msgid "Part Details"
 msgstr "Teile-Details"
 
-#: part/templates/part/detail.html:22 part/templates/part/part_base.html:85
+#: part/templates/part/detail.html:22 part/templates/part/part_base.html:75
 msgid "IPN"
 msgstr "IPN (Interne Produktnummer)"
 
@@ -1216,34 +1509,44 @@ msgstr "Teil-Bemerkungen"
 msgid "This part is not active"
 msgstr "Dieses Teil ist nicht aktiv"
 
-#: part/templates/part/part_base.html:47
+#: part/templates/part/part_base.html:37
 msgid "Star this part"
 msgstr "Teil favorisieren"
 
-#: part/templates/part/part_base.html:53
+#: part/templates/part/part_base.html:43
 msgid "Show pricing information"
 msgstr "Kosteninformationen ansehen"
 
-#: part/templates/part/part_base.html:105
+#: part/templates/part/part_base.html:95
 msgid "Available Stock"
 msgstr "Verfügbarer Lagerbestand"
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:100
 msgid "In Stock"
 msgstr "Auf Lager"
 
-#: part/templates/part/part_base.html:131
+#: part/templates/part/part_base.html:121
 msgid "Build Status"
 msgstr "Bau-Status"
 
-#: part/templates/part/part_base.html:135
+#: part/templates/part/part_base.html:125
 msgid "Can Build"
 msgstr "Herstellbar?"
 
-#: part/templates/part/part_base.html:140
+#: part/templates/part/part_base.html:130
 msgid "Underway"
 msgstr "unterwegs"
 
+#: part/templates/part/part_thumb.html:16
+#, fuzzy
+#| msgid "Select part"
+msgid "Select from existing images"
+msgstr "Teil auswählen"
+
+#: part/templates/part/part_thumb.html:17
+msgid "Upload new image"
+msgstr ""
+
 #: part/templates/part/tabs.html:9
 msgid "Parameters"
 msgstr "Parameter"
@@ -1277,195 +1580,231 @@ msgstr "Tracking"
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: part/views.py:77
+#: part/views.py:75
+#, fuzzy
+#| msgid "Add Attachment"
+msgid "Add part attachment"
+msgstr "Anhang hinzufügen"
+
+#: part/views.py:80
 #, fuzzy
 #| msgid "Add Attachment"
 msgid "Added attachment"
 msgstr "Anhang hinzufügen"
 
-#: part/views.py:119
+#: part/views.py:122
 #, fuzzy
 #| msgid "Part Attachments"
 msgid "Part attachment updated"
 msgstr "Anhänge"
 
-#: part/views.py:196
+#: part/views.py:137
+#, fuzzy
+#| msgid "Delete attachment"
+msgid "Delete Part Attachment"
+msgstr "Anhang löschen"
+
+#: part/views.py:143
+#, fuzzy
+#| msgid "Delete attachment"
+msgid "Deleted part attachment"
+msgstr "Anhang löschen"
+
+#: part/views.py:151
+#, fuzzy
+#| msgid "Select part category"
+msgid "Set Part Category"
+msgstr "Teilekategorie wählen"
+
+#: part/views.py:199
 #, python-brace-format
 msgid "Set category for {n} parts"
 msgstr "Kategorie für {n} Teile setzen"
 
-#: part/views.py:306
+#: part/views.py:234
+#, fuzzy
+#| msgid "Create new Stock Item"
+msgid "Create Variant"
+msgstr "Neues Lagerobjekt hinzufügen"
+
+#: part/views.py:304
+#, fuzzy
+#| msgid "Supplier Part"
+msgid "Duplicate Part"
+msgstr "Zulieferer-Teil"
+
+#: part/views.py:309
 #, fuzzy
 #| msgid "Supplier part"
 msgid "Copied part"
 msgstr "Zulieferer-Teil"
 
-#: part/views.py:414
+#: part/views.py:417
 #, fuzzy
 #| msgid "Create new Stock Item"
 msgid "Create new part"
 msgstr "Neues Lagerobjekt hinzufügen"
 
-#: part/views.py:419
+#: part/views.py:422
 #, fuzzy
 #| msgid "Created new stock item"
 msgid "Created new part"
 msgstr "Neues Lagerobjekt erstellt"
 
-#: part/views.py:609
+#: part/views.py:595
+#, fuzzy
+#| msgid "Part Notes"
+msgid "Part QR Code"
+msgstr "Teil-Bemerkungen"
+
+#: part/views.py:612
 msgid "Upload Part Image"
 msgstr ""
 
-#: part/views.py:614
+#: part/views.py:617 part/views.py:652
 msgid "Updated part image"
 msgstr ""
 
-#: part/views.py:623
+#: part/views.py:626
 #, fuzzy
 #| msgid "Select part"
 msgid "Select Part Image"
 msgstr "Teil auswählen"
 
-#: part/views.py:627
-#, fuzzy
-#| msgid "Select part"
-msgid "Selected part image"
-msgstr "Teil auswählen"
+#: part/views.py:655
+msgid "Part image not found"
+msgstr ""
 
-#: part/views.py:637
+#: part/views.py:666
 #, fuzzy
 #| msgid "Edit notes"
 msgid "Edit Part Properties"
 msgstr "Bermerkungen bearbeiten"
 
-#: part/views.py:659
+#: part/views.py:688
 msgid "Validate BOM"
 msgstr ""
 
-#: part/views.py:821
+#: part/views.py:850
 msgid "No BOM file provided"
 msgstr "Keine Stückliste angegeben"
 
-#: part/views.py:1082
+#: part/views.py:1111
 msgid "Enter a valid quantity"
 msgstr "Bitte eine gültige Anzahl eingeben"
 
-#: part/views.py:1106 part/views.py:1109
+#: part/views.py:1135 part/views.py:1138
 msgid "Select valid part"
 msgstr "Bitte ein gültiges Teil auswählen"
 
-#: part/views.py:1115
+#: part/views.py:1144
 msgid "Duplicate part selected"
 msgstr "Teil doppelt ausgewählt"
 
-#: part/views.py:1143
+#: part/views.py:1172
 msgid "Select a part"
 msgstr "Teil auswählen"
 
-#: part/views.py:1147
+#: part/views.py:1176
 msgid "Specify quantity"
 msgstr "Anzahl angeben"
 
-#: part/views.py:1324
+#: part/views.py:1356
+msgid "Export Bill of Materials"
+msgstr ""
+
+#: part/views.py:1396
 #, fuzzy
 #| msgid "Confirm part creation"
 msgid "Confirm Part Deletion"
 msgstr "Erstellen des Teils bestätigen"
 
-#: part/views.py:1331
+#: part/views.py:1403
 msgid "Part was deleted"
 msgstr ""
 
-#: part/views.py:1340
+#: part/views.py:1412
 #, fuzzy
 #| msgid "Part packaging"
 msgid "Part Pricing"
 msgstr "Teile-Packaging"
 
-#: part/views.py:1462
+#: part/views.py:1534
 #, fuzzy
 #| msgid "Parameter Template"
 msgid "Create Part Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/views.py:1470
+#: part/views.py:1542
 #, fuzzy
 #| msgid "Parameter Template"
 msgid "Edit Part Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/views.py:1477
+#: part/views.py:1549
 #, fuzzy
 #| msgid "Parameter Template"
 msgid "Delete Part Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/views.py:1485
+#: part/views.py:1557
 msgid "Create Part Parameter"
 msgstr ""
 
-#: part/views.py:1535
+#: part/views.py:1607
 #, fuzzy
 #| msgid "Edit attachment"
 msgid "Edit Part Parameter"
 msgstr "Anhang bearbeiten"
 
-#: part/views.py:1549
+#: part/views.py:1621
 #, fuzzy
 #| msgid "Delete attachment"
 msgid "Delete Part Parameter"
 msgstr "Anhang löschen"
 
-#: part/views.py:1565
+#: part/views.py:1637
 #, fuzzy
 #| msgid "Part category"
 msgid "Edit Part Category"
 msgstr "Teile-Kategorie"
 
-#: part/views.py:1600
+#: part/views.py:1672
 #, fuzzy
 #| msgid "Select part category"
 msgid "Delete Part Category"
 msgstr "Teilekategorie wählen"
 
-#: part/views.py:1606
+#: part/views.py:1678
 #, fuzzy
 #| msgid "Part category"
 msgid "Part category was deleted"
 msgstr "Teile-Kategorie"
 
-#: part/views.py:1614
+#: part/views.py:1686
 #, fuzzy
 #| msgid "Select part category"
 msgid "Create new part category"
 msgstr "Teilekategorie wählen"
 
-#: part/views.py:1665
+#: part/views.py:1737
 #, fuzzy
 #| msgid "Created new stock item"
 msgid "Create BOM item"
 msgstr "Neues Lagerobjekt erstellt"
 
-#: part/views.py:1731
+#: part/views.py:1803
 #, fuzzy
 #| msgid "Edit Stock Item"
 msgid "Edit BOM item"
 msgstr "Lagerobjekt bearbeiten"
 
-#: part/views.py:1779
+#: part/views.py:1851
 #, fuzzy
 #| msgid "Confirm build completion"
 msgid "Confim BOM item deletion"
 msgstr "Bau-Fertigstellung bestätigen"
 
-#: stock/forms.py:91
-msgid "File Format"
-msgstr "Dateiformat"
-
-#: stock/forms.py:91
-msgid "Select output file format"
-msgstr "Ausgabe-Dateiformat auswählen"
-
 #: stock/forms.py:93
 msgid "Include stock items in sub locations"
 msgstr "Lagerobjekte in untergeordneten Lagerorten einschließen"
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 930ff589f8..f6daf1d37b 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-10 11:09+0000\n"
+"POT-Creation-Date: 2020-02-11 23:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,7 +104,7 @@ msgstr ""
 
 #: InvenTree/status_codes.py:92 build/templates/build/allocate_edit.html:28
 #: build/templates/build/allocate_view.html:21
-#: part/templates/part/part_base.html:116 part/templates/part/tabs.html:21
+#: part/templates/part/part_base.html:106 part/templates/part/tabs.html:21
 msgid "Allocated"
 msgstr ""
 
@@ -149,59 +149,59 @@ msgstr ""
 msgid "Confirm build completion"
 msgstr ""
 
-#: build/models.py:53
+#: build/models.py:54
 msgid "Brief description of the build"
 msgstr ""
 
-#: build/models.py:62
+#: build/models.py:63
 msgid "Select part to build"
 msgstr ""
 
-#: build/models.py:68
+#: build/models.py:69
 msgid ""
 "Select location to take stock from for this build (leave blank to take from "
 "any stock location)"
 msgstr ""
 
-#: build/models.py:74
+#: build/models.py:75
 msgid "Number of parts to build"
 msgstr ""
 
-#: build/models.py:80
+#: build/models.py:81
 msgid "Build status"
 msgstr ""
 
-#: build/models.py:83
+#: build/models.py:84
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:95
+#: build/models.py:96
 msgid "Link to external URL"
 msgstr ""
 
-#: build/models.py:97
+#: build/models.py:98
 msgid "Extra build notes"
 msgstr ""
 
-#: build/models.py:382
+#: build/models.py:383
 #, python-brace-format
 msgid "Selected stock item not found in BOM for part '{p}'"
 msgstr ""
 
-#: build/models.py:385
+#: build/models.py:386
 #, python-brace-format
 msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
 msgstr ""
 
-#: build/models.py:403
+#: build/models.py:404
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:410
+#: build/models.py:411
 msgid "Stock Item to allocate to build"
 msgstr ""
 
-#: build/models.py:418
+#: build/models.py:419
 msgid "Stock quantity to allocate to build"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgid "Allocate"
 msgstr ""
 
 #: build/templates/build/allocate_view.html:10
-#: company/templates/company/detail_part.html:18
+#: company/templates/company/detail_part.html:18 order/views.py:448
 msgid "Order Parts"
 msgstr ""
 
@@ -257,10 +257,14 @@ msgid "Description"
 msgstr ""
 
 #: build/templates/build/allocate_view.html:22
-#: part/templates/part/part_base.html:122
+#: part/templates/part/part_base.html:112
 msgid "On Order"
 msgstr ""
 
+#: build/templates/build/delete_build_item.html:6
+msgid "Are you sure you want to unallocate these parts?"
+msgstr ""
+
 #: build/templates/build/detail.html:8
 msgid "Build Details"
 msgstr ""
@@ -298,7 +302,7 @@ msgstr ""
 #: build/templates/build/detail.html:42
 #: company/templates/company/detail_part.html:90
 #: company/templates/company/partdetail.html:54
-#: part/templates/part/detail.html:50 part/templates/part/part_base.html:91
+#: part/templates/part/detail.html:50 part/templates/part/part_base.html:81
 #: stock/templates/stock/item_base.html:120
 msgid "URL"
 msgstr ""
@@ -355,11 +359,107 @@ msgstr ""
 msgid "Assign Parts"
 msgstr ""
 
+#: build/templates/build/unallocate.html:8
+msgid "Are you sure you wish to unallocate all stock for this build?"
+msgstr ""
+
+#: build/views.py:56
+msgid "Cancel Build"
+msgstr ""
+
+#: build/views.py:74
+msgid "Confirm build cancellation"
+msgstr ""
+
+#: build/views.py:79
+msgid "Build was cancelled"
+msgstr ""
+
+#: build/views.py:95
+msgid "Allocate Stock"
+msgstr ""
+
+#: build/views.py:108
+msgid "No matching build found"
+msgstr ""
+
+#: build/views.py:127
+msgid "Confirm stock allocation"
+msgstr ""
+
+#: build/views.py:128
+msgid "Check the confirmation box at the bottom of the list"
+msgstr ""
+
+#: build/views.py:148 build/views.py:442
+msgid "Unallocate Stock"
+msgstr ""
+
+#: build/views.py:161
+msgid "Confirm unallocation of build stock"
+msgstr ""
+
+#: build/views.py:162
+msgid "Check the confirmation box"
+msgstr ""
+
+#: build/views.py:185
+msgid "Complete Build"
+msgstr ""
+
+#: build/views.py:258
+msgid "Confirm completion of build"
+msgstr ""
+
+#: build/views.py:265
+msgid "Invalid location selected"
+msgstr ""
+
 #: build/views.py:290 stock/views.py:884
 #, python-brace-format
 msgid "The following serial numbers already exist: ({sn})"
 msgstr ""
 
+#: build/views.py:309
+msgid "Build marked as COMPLETE"
+msgstr ""
+
+#: build/views.py:385
+msgid "Start new Build"
+msgstr ""
+
+#: build/views.py:408
+msgid "Created new build"
+msgstr ""
+
+#: build/views.py:418
+msgid "Edit Build Details"
+msgstr ""
+
+#: build/views.py:423
+msgid "Edited build"
+msgstr ""
+
+#: build/views.py:432
+msgid "Delete Build"
+msgstr ""
+
+#: build/views.py:447
+msgid "Removed parts from build allocation"
+msgstr ""
+
+#: build/views.py:457
+msgid "Allocate new Part"
+msgstr ""
+
+#: build/views.py:573
+msgid "Edit Stock Allocation"
+msgstr ""
+
+#: build/views.py:577
+msgid "Updated Build Item"
+msgstr ""
+
 #: common/models.py:69
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
@@ -396,6 +496,18 @@ msgstr ""
 msgid "Use this currency as the base currency"
 msgstr ""
 
+#: common/views.py:21
+msgid "Create new Currency"
+msgstr ""
+
+#: common/views.py:29
+msgid "Edit Currency"
+msgstr ""
+
+#: common/views.py:36
+msgid "Delete Currency"
+msgstr ""
+
 #: company/models.py:74
 msgid "Company name"
 msgstr ""
@@ -643,6 +755,62 @@ msgstr ""
 msgid "Sales Orders"
 msgstr ""
 
+#: company/views.py:97
+msgid "Update Company Image"
+msgstr ""
+
+#: company/views.py:102
+msgid "Updated company image"
+msgstr ""
+
+#: company/views.py:112
+msgid "Edit Company"
+msgstr ""
+
+#: company/views.py:116
+msgid "Edited company information"
+msgstr ""
+
+#: company/views.py:126
+msgid "Create new Company"
+msgstr ""
+
+#: company/views.py:130
+msgid "Created new company"
+msgstr ""
+
+#: company/views.py:140
+msgid "Delete Company"
+msgstr ""
+
+#: company/views.py:145
+msgid "Company was deleted"
+msgstr ""
+
+#: company/views.py:170
+msgid "Edit Supplier Part"
+msgstr ""
+
+#: company/views.py:179
+msgid "Create new Supplier Part"
+msgstr ""
+
+#: company/views.py:236
+msgid "Delete Supplier Part"
+msgstr ""
+
+#: company/views.py:306
+msgid "Add Price Break"
+msgstr ""
+
+#: company/views.py:341
+msgid "Edit Price Break"
+msgstr ""
+
+#: company/views.py:356
+msgid "Delete Price Break"
+msgstr ""
+
 #: order/forms.py:21
 msgid "Place order"
 msgstr ""
@@ -675,7 +843,7 @@ msgstr ""
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:159 order/models.py:210 part/views.py:1080
+#: order/models.py:159 order/models.py:210 part/views.py:1109
 #: stock/models.py:440
 msgid "Quantity must be greater than zero"
 msgstr ""
@@ -730,7 +898,7 @@ msgstr ""
 msgid "Order Notes"
 msgstr ""
 
-#: order/templates/order/purchase_order_detail.html:15
+#: order/templates/order/purchase_order_detail.html:15 order/views.py:747
 msgid "Add Line Item"
 msgstr ""
 
@@ -754,14 +922,38 @@ msgstr ""
 msgid "Items"
 msgstr ""
 
+#: order/views.py:99
+msgid "Create Purchase Order"
+msgstr ""
+
+#: order/views.py:129
+msgid "Edit Purchase Order"
+msgstr ""
+
+#: order/views.py:149
+msgid "Cancel Order"
+msgstr ""
+
 #: order/views.py:164
 msgid "Confirm order cancellation"
 msgstr ""
 
+#: order/views.py:182
+msgid "Issue Order"
+msgstr ""
+
 #: order/views.py:197
 msgid "Confirm order placement"
 msgstr ""
 
+#: order/views.py:218
+msgid "Complete Order"
+msgstr ""
+
+#: order/views.py:284
+msgid "Receive Parts"
+msgstr ""
+
 #: order/views.py:351
 msgid "Items received"
 msgstr ""
@@ -794,220 +986,248 @@ msgstr ""
 msgid "Invalid SupplierPart selection"
 msgstr ""
 
-#: part/bom.py:107
+#: order/views.py:862
+msgid "Edit Line Item"
+msgstr ""
+
+#: order/views.py:878
+msgid "Delete Line Item"
+msgstr ""
+
+#: order/views.py:883
+msgid "Deleted line item"
+msgstr ""
+
+#: part/bom.py:140
 #, python-brace-format
 msgid "Unsupported file format: {f}"
 msgstr ""
 
-#: part/bom.py:112
+#: part/bom.py:145
 msgid "Error reading BOM file (invalid data)"
 msgstr ""
 
-#: part/bom.py:114
+#: part/bom.py:147
 msgid "Error reading BOM file (incorrect row size)"
 msgstr ""
 
-#: part/forms.py:37
+#: part/forms.py:37 stock/forms.py:91
+msgid "File Format"
+msgstr ""
+
+#: part/forms.py:37 stock/forms.py:91
+msgid "Select output file format"
+msgstr ""
+
+#: part/forms.py:39
+msgid "Cascading"
+msgstr ""
+
+#: part/forms.py:39
+msgid "Download cascading / multi-level BOM"
+msgstr ""
+
+#: part/forms.py:58
 msgid "Confirm that the BOM is correct"
 msgstr ""
 
-#: part/forms.py:49
+#: part/forms.py:70
 msgid "Select BOM file to upload"
 msgstr ""
 
-#: part/forms.py:73
+#: part/forms.py:94
 msgid "Select part category"
 msgstr ""
 
-#: part/forms.py:81
+#: part/forms.py:102
 msgid "Perform 'deep copy' which will duplicate all BOM data for this part"
 msgstr ""
 
-#: part/forms.py:86
+#: part/forms.py:107
 msgid "Confirm part creation"
 msgstr ""
 
-#: part/forms.py:172
+#: part/forms.py:193
 msgid "Input quantity for price calculation"
 msgstr ""
 
-#: part/forms.py:175
+#: part/forms.py:196
 msgid "Select currency for price calculation"
 msgstr ""
 
-#: part/models.py:57
+#: part/models.py:59
 msgid "Default location for parts in this category"
 msgstr ""
 
-#: part/models.py:60
+#: part/models.py:62
 msgid "Default keywords for parts in this category"
 msgstr ""
 
-#: part/models.py:309
+#: part/models.py:323
 msgid "Part must be unique for name, IPN and revision"
 msgstr ""
 
-#: part/models.py:323
+#: part/models.py:337
 msgid "Part cannot be a template part if it is a variant of another part"
 msgstr ""
 
-#: part/models.py:324
+#: part/models.py:338
 msgid "Part cannot be a variant of another part if it is already a template"
 msgstr ""
 
-#: part/models.py:328 part/templates/part/detail.html:17
+#: part/models.py:342 part/templates/part/detail.html:17
 msgid "Part name"
 msgstr ""
 
-#: part/models.py:332
+#: part/models.py:346
 msgid "Is this part a template part?"
 msgstr ""
 
-#: part/models.py:341
+#: part/models.py:355
 msgid "Is this part a variant of another part?"
 msgstr ""
 
-#: part/models.py:343
+#: part/models.py:357
 msgid "Part description"
 msgstr ""
 
-#: part/models.py:345
+#: part/models.py:359
 msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
-#: part/models.py:350
+#: part/models.py:364
 msgid "Part category"
 msgstr ""
 
-#: part/models.py:352
+#: part/models.py:366
 msgid "Internal Part Number"
 msgstr ""
 
-#: part/models.py:354
+#: part/models.py:368
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:356
+#: part/models.py:370
 msgid "Link to extenal URL"
 msgstr ""
 
-#: part/models.py:362
+#: part/models.py:376
 msgid "Where is this item normally stored?"
 msgstr ""
 
-#: part/models.py:406
+#: part/models.py:420
 msgid "Default supplier part"
 msgstr ""
 
-#: part/models.py:409
+#: part/models.py:423
 msgid "Minimum allowed stock level"
 msgstr ""
 
-#: part/models.py:411
+#: part/models.py:425
 msgid "Stock keeping units for this part"
 msgstr ""
 
-#: part/models.py:413
+#: part/models.py:427
 msgid "Can this part be built from other parts?"
 msgstr ""
 
-#: part/models.py:415
+#: part/models.py:429
 msgid "Can this part be used to build other parts?"
 msgstr ""
 
-#: part/models.py:417
+#: part/models.py:431
 msgid "Does this part have tracking for unique items?"
 msgstr ""
 
-#: part/models.py:419
+#: part/models.py:433
 msgid "Can this part be purchased from external suppliers?"
 msgstr ""
 
-#: part/models.py:421
+#: part/models.py:435
 msgid "Can this part be sold to customers?"
 msgstr ""
 
-#: part/models.py:423
+#: part/models.py:437
 msgid "Is this part active?"
 msgstr ""
 
-#: part/models.py:425
+#: part/models.py:439
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr ""
 
-#: part/models.py:427
+#: part/models.py:441
 msgid "Part notes - supports Markdown formatting"
 msgstr ""
 
-#: part/models.py:429
+#: part/models.py:443
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:936
+#: part/models.py:948
 msgid "Select file to attach"
 msgstr ""
 
-#: part/models.py:938
+#: part/models.py:950
 msgid "File comment"
 msgstr ""
 
-#: part/models.py:993
+#: part/models.py:1005
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:998
+#: part/models.py:1010
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:1000
+#: part/models.py:1012
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:1026
+#: part/models.py:1038
 msgid "Parent Part"
 msgstr ""
 
-#: part/models.py:1028
+#: part/models.py:1040
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:1030
+#: part/models.py:1042
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:1054
+#: part/models.py:1066
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:1062
+#: part/models.py:1074
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:1068
+#: part/models.py:1080
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:1071
+#: part/models.py:1083
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:1074
+#: part/models.py:1086
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:1077
+#: part/models.py:1089
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:1079
+#: part/models.py:1091
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:1142
+#: part/models.py:1154
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr ""
 
-#: part/models.py:1149
+#: part/models.py:1161
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr ""
@@ -1028,7 +1248,7 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: part/templates/part/attachments.html:34
+#: part/templates/part/attachments.html:34 part/views.py:118
 msgid "Edit attachment"
 msgstr ""
 
@@ -1077,7 +1297,7 @@ msgstr ""
 msgid "Part Details"
 msgstr ""
 
-#: part/templates/part/detail.html:22 part/templates/part/part_base.html:85
+#: part/templates/part/detail.html:22 part/templates/part/part_base.html:75
 msgid "IPN"
 msgstr ""
 
@@ -1181,34 +1401,42 @@ msgstr ""
 msgid "This part is not active"
 msgstr ""
 
-#: part/templates/part/part_base.html:47
+#: part/templates/part/part_base.html:37
 msgid "Star this part"
 msgstr ""
 
-#: part/templates/part/part_base.html:53
+#: part/templates/part/part_base.html:43
 msgid "Show pricing information"
 msgstr ""
 
-#: part/templates/part/part_base.html:105
+#: part/templates/part/part_base.html:95
 msgid "Available Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:100
 msgid "In Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:131
+#: part/templates/part/part_base.html:121
 msgid "Build Status"
 msgstr ""
 
-#: part/templates/part/part_base.html:135
+#: part/templates/part/part_base.html:125
 msgid "Can Build"
 msgstr ""
 
-#: part/templates/part/part_base.html:140
+#: part/templates/part/part_base.html:130
 msgid "Underway"
 msgstr ""
 
+#: part/templates/part/part_thumb.html:16
+msgid "Select from existing images"
+msgstr ""
+
+#: part/templates/part/part_thumb.html:17
+msgid "Upload new image"
+msgstr ""
+
 #: part/templates/part/tabs.html:9
 msgid "Parameters"
 msgstr ""
@@ -1242,151 +1470,175 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
-#: part/views.py:77
+#: part/views.py:75
+msgid "Add part attachment"
+msgstr ""
+
+#: part/views.py:80
 msgid "Added attachment"
 msgstr ""
 
-#: part/views.py:119
+#: part/views.py:122
 msgid "Part attachment updated"
 msgstr ""
 
-#: part/views.py:196
+#: part/views.py:137
+msgid "Delete Part Attachment"
+msgstr ""
+
+#: part/views.py:143
+msgid "Deleted part attachment"
+msgstr ""
+
+#: part/views.py:151
+msgid "Set Part Category"
+msgstr ""
+
+#: part/views.py:199
 #, python-brace-format
 msgid "Set category for {n} parts"
 msgstr ""
 
-#: part/views.py:306
+#: part/views.py:234
+msgid "Create Variant"
+msgstr ""
+
+#: part/views.py:304
+msgid "Duplicate Part"
+msgstr ""
+
+#: part/views.py:309
 msgid "Copied part"
 msgstr ""
 
-#: part/views.py:414
+#: part/views.py:417
 msgid "Create new part"
 msgstr ""
 
-#: part/views.py:419
+#: part/views.py:422
 msgid "Created new part"
 msgstr ""
 
-#: part/views.py:609
+#: part/views.py:595
+msgid "Part QR Code"
+msgstr ""
+
+#: part/views.py:612
 msgid "Upload Part Image"
 msgstr ""
 
-#: part/views.py:614
+#: part/views.py:617 part/views.py:652
 msgid "Updated part image"
 msgstr ""
 
-#: part/views.py:623
+#: part/views.py:626
 msgid "Select Part Image"
 msgstr ""
 
-#: part/views.py:627
-msgid "Selected part image"
+#: part/views.py:655
+msgid "Part image not found"
 msgstr ""
 
-#: part/views.py:637
+#: part/views.py:666
 msgid "Edit Part Properties"
 msgstr ""
 
-#: part/views.py:659
+#: part/views.py:688
 msgid "Validate BOM"
 msgstr ""
 
-#: part/views.py:821
+#: part/views.py:850
 msgid "No BOM file provided"
 msgstr ""
 
-#: part/views.py:1082
+#: part/views.py:1111
 msgid "Enter a valid quantity"
 msgstr ""
 
-#: part/views.py:1106 part/views.py:1109
+#: part/views.py:1135 part/views.py:1138
 msgid "Select valid part"
 msgstr ""
 
-#: part/views.py:1115
+#: part/views.py:1144
 msgid "Duplicate part selected"
 msgstr ""
 
-#: part/views.py:1143
+#: part/views.py:1172
 msgid "Select a part"
 msgstr ""
 
-#: part/views.py:1147
+#: part/views.py:1176
 msgid "Specify quantity"
 msgstr ""
 
-#: part/views.py:1324
+#: part/views.py:1356
+msgid "Export Bill of Materials"
+msgstr ""
+
+#: part/views.py:1396
 msgid "Confirm Part Deletion"
 msgstr ""
 
-#: part/views.py:1331
+#: part/views.py:1403
 msgid "Part was deleted"
 msgstr ""
 
-#: part/views.py:1340
+#: part/views.py:1412
 msgid "Part Pricing"
 msgstr ""
 
-#: part/views.py:1462
+#: part/views.py:1534
 msgid "Create Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1470
+#: part/views.py:1542
 msgid "Edit Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1477
+#: part/views.py:1549
 msgid "Delete Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1485
+#: part/views.py:1557
 msgid "Create Part Parameter"
 msgstr ""
 
-#: part/views.py:1535
+#: part/views.py:1607
 msgid "Edit Part Parameter"
 msgstr ""
 
-#: part/views.py:1549
+#: part/views.py:1621
 msgid "Delete Part Parameter"
 msgstr ""
 
-#: part/views.py:1565
+#: part/views.py:1637
 msgid "Edit Part Category"
 msgstr ""
 
-#: part/views.py:1600
+#: part/views.py:1672
 msgid "Delete Part Category"
 msgstr ""
 
-#: part/views.py:1606
+#: part/views.py:1678
 msgid "Part category was deleted"
 msgstr ""
 
-#: part/views.py:1614
+#: part/views.py:1686
 msgid "Create new part category"
 msgstr ""
 
-#: part/views.py:1665
+#: part/views.py:1737
 msgid "Create BOM item"
 msgstr ""
 
-#: part/views.py:1731
+#: part/views.py:1803
 msgid "Edit BOM item"
 msgstr ""
 
-#: part/views.py:1779
+#: part/views.py:1851
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: stock/forms.py:91
-msgid "File Format"
-msgstr ""
-
-#: stock/forms.py:91
-msgid "Select output file format"
-msgstr ""
-
 #: stock/forms.py:93
 msgid "Include stock items in sub locations"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 930ff589f8..f6daf1d37b 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-02-10 11:09+0000\n"
+"POT-Creation-Date: 2020-02-11 23:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -104,7 +104,7 @@ msgstr ""
 
 #: InvenTree/status_codes.py:92 build/templates/build/allocate_edit.html:28
 #: build/templates/build/allocate_view.html:21
-#: part/templates/part/part_base.html:116 part/templates/part/tabs.html:21
+#: part/templates/part/part_base.html:106 part/templates/part/tabs.html:21
 msgid "Allocated"
 msgstr ""
 
@@ -149,59 +149,59 @@ msgstr ""
 msgid "Confirm build completion"
 msgstr ""
 
-#: build/models.py:53
+#: build/models.py:54
 msgid "Brief description of the build"
 msgstr ""
 
-#: build/models.py:62
+#: build/models.py:63
 msgid "Select part to build"
 msgstr ""
 
-#: build/models.py:68
+#: build/models.py:69
 msgid ""
 "Select location to take stock from for this build (leave blank to take from "
 "any stock location)"
 msgstr ""
 
-#: build/models.py:74
+#: build/models.py:75
 msgid "Number of parts to build"
 msgstr ""
 
-#: build/models.py:80
+#: build/models.py:81
 msgid "Build status"
 msgstr ""
 
-#: build/models.py:83
+#: build/models.py:84
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:95
+#: build/models.py:96
 msgid "Link to external URL"
 msgstr ""
 
-#: build/models.py:97
+#: build/models.py:98
 msgid "Extra build notes"
 msgstr ""
 
-#: build/models.py:382
+#: build/models.py:383
 #, python-brace-format
 msgid "Selected stock item not found in BOM for part '{p}'"
 msgstr ""
 
-#: build/models.py:385
+#: build/models.py:386
 #, python-brace-format
 msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
 msgstr ""
 
-#: build/models.py:403
+#: build/models.py:404
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:410
+#: build/models.py:411
 msgid "Stock Item to allocate to build"
 msgstr ""
 
-#: build/models.py:418
+#: build/models.py:419
 msgid "Stock quantity to allocate to build"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgid "Allocate"
 msgstr ""
 
 #: build/templates/build/allocate_view.html:10
-#: company/templates/company/detail_part.html:18
+#: company/templates/company/detail_part.html:18 order/views.py:448
 msgid "Order Parts"
 msgstr ""
 
@@ -257,10 +257,14 @@ msgid "Description"
 msgstr ""
 
 #: build/templates/build/allocate_view.html:22
-#: part/templates/part/part_base.html:122
+#: part/templates/part/part_base.html:112
 msgid "On Order"
 msgstr ""
 
+#: build/templates/build/delete_build_item.html:6
+msgid "Are you sure you want to unallocate these parts?"
+msgstr ""
+
 #: build/templates/build/detail.html:8
 msgid "Build Details"
 msgstr ""
@@ -298,7 +302,7 @@ msgstr ""
 #: build/templates/build/detail.html:42
 #: company/templates/company/detail_part.html:90
 #: company/templates/company/partdetail.html:54
-#: part/templates/part/detail.html:50 part/templates/part/part_base.html:91
+#: part/templates/part/detail.html:50 part/templates/part/part_base.html:81
 #: stock/templates/stock/item_base.html:120
 msgid "URL"
 msgstr ""
@@ -355,11 +359,107 @@ msgstr ""
 msgid "Assign Parts"
 msgstr ""
 
+#: build/templates/build/unallocate.html:8
+msgid "Are you sure you wish to unallocate all stock for this build?"
+msgstr ""
+
+#: build/views.py:56
+msgid "Cancel Build"
+msgstr ""
+
+#: build/views.py:74
+msgid "Confirm build cancellation"
+msgstr ""
+
+#: build/views.py:79
+msgid "Build was cancelled"
+msgstr ""
+
+#: build/views.py:95
+msgid "Allocate Stock"
+msgstr ""
+
+#: build/views.py:108
+msgid "No matching build found"
+msgstr ""
+
+#: build/views.py:127
+msgid "Confirm stock allocation"
+msgstr ""
+
+#: build/views.py:128
+msgid "Check the confirmation box at the bottom of the list"
+msgstr ""
+
+#: build/views.py:148 build/views.py:442
+msgid "Unallocate Stock"
+msgstr ""
+
+#: build/views.py:161
+msgid "Confirm unallocation of build stock"
+msgstr ""
+
+#: build/views.py:162
+msgid "Check the confirmation box"
+msgstr ""
+
+#: build/views.py:185
+msgid "Complete Build"
+msgstr ""
+
+#: build/views.py:258
+msgid "Confirm completion of build"
+msgstr ""
+
+#: build/views.py:265
+msgid "Invalid location selected"
+msgstr ""
+
 #: build/views.py:290 stock/views.py:884
 #, python-brace-format
 msgid "The following serial numbers already exist: ({sn})"
 msgstr ""
 
+#: build/views.py:309
+msgid "Build marked as COMPLETE"
+msgstr ""
+
+#: build/views.py:385
+msgid "Start new Build"
+msgstr ""
+
+#: build/views.py:408
+msgid "Created new build"
+msgstr ""
+
+#: build/views.py:418
+msgid "Edit Build Details"
+msgstr ""
+
+#: build/views.py:423
+msgid "Edited build"
+msgstr ""
+
+#: build/views.py:432
+msgid "Delete Build"
+msgstr ""
+
+#: build/views.py:447
+msgid "Removed parts from build allocation"
+msgstr ""
+
+#: build/views.py:457
+msgid "Allocate new Part"
+msgstr ""
+
+#: build/views.py:573
+msgid "Edit Stock Allocation"
+msgstr ""
+
+#: build/views.py:577
+msgid "Updated Build Item"
+msgstr ""
+
 #: common/models.py:69
 msgid "Settings key (must be unique - case insensitive"
 msgstr ""
@@ -396,6 +496,18 @@ msgstr ""
 msgid "Use this currency as the base currency"
 msgstr ""
 
+#: common/views.py:21
+msgid "Create new Currency"
+msgstr ""
+
+#: common/views.py:29
+msgid "Edit Currency"
+msgstr ""
+
+#: common/views.py:36
+msgid "Delete Currency"
+msgstr ""
+
 #: company/models.py:74
 msgid "Company name"
 msgstr ""
@@ -643,6 +755,62 @@ msgstr ""
 msgid "Sales Orders"
 msgstr ""
 
+#: company/views.py:97
+msgid "Update Company Image"
+msgstr ""
+
+#: company/views.py:102
+msgid "Updated company image"
+msgstr ""
+
+#: company/views.py:112
+msgid "Edit Company"
+msgstr ""
+
+#: company/views.py:116
+msgid "Edited company information"
+msgstr ""
+
+#: company/views.py:126
+msgid "Create new Company"
+msgstr ""
+
+#: company/views.py:130
+msgid "Created new company"
+msgstr ""
+
+#: company/views.py:140
+msgid "Delete Company"
+msgstr ""
+
+#: company/views.py:145
+msgid "Company was deleted"
+msgstr ""
+
+#: company/views.py:170
+msgid "Edit Supplier Part"
+msgstr ""
+
+#: company/views.py:179
+msgid "Create new Supplier Part"
+msgstr ""
+
+#: company/views.py:236
+msgid "Delete Supplier Part"
+msgstr ""
+
+#: company/views.py:306
+msgid "Add Price Break"
+msgstr ""
+
+#: company/views.py:341
+msgid "Edit Price Break"
+msgstr ""
+
+#: company/views.py:356
+msgid "Delete Price Break"
+msgstr ""
+
 #: order/forms.py:21
 msgid "Place order"
 msgstr ""
@@ -675,7 +843,7 @@ msgstr ""
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:159 order/models.py:210 part/views.py:1080
+#: order/models.py:159 order/models.py:210 part/views.py:1109
 #: stock/models.py:440
 msgid "Quantity must be greater than zero"
 msgstr ""
@@ -730,7 +898,7 @@ msgstr ""
 msgid "Order Notes"
 msgstr ""
 
-#: order/templates/order/purchase_order_detail.html:15
+#: order/templates/order/purchase_order_detail.html:15 order/views.py:747
 msgid "Add Line Item"
 msgstr ""
 
@@ -754,14 +922,38 @@ msgstr ""
 msgid "Items"
 msgstr ""
 
+#: order/views.py:99
+msgid "Create Purchase Order"
+msgstr ""
+
+#: order/views.py:129
+msgid "Edit Purchase Order"
+msgstr ""
+
+#: order/views.py:149
+msgid "Cancel Order"
+msgstr ""
+
 #: order/views.py:164
 msgid "Confirm order cancellation"
 msgstr ""
 
+#: order/views.py:182
+msgid "Issue Order"
+msgstr ""
+
 #: order/views.py:197
 msgid "Confirm order placement"
 msgstr ""
 
+#: order/views.py:218
+msgid "Complete Order"
+msgstr ""
+
+#: order/views.py:284
+msgid "Receive Parts"
+msgstr ""
+
 #: order/views.py:351
 msgid "Items received"
 msgstr ""
@@ -794,220 +986,248 @@ msgstr ""
 msgid "Invalid SupplierPart selection"
 msgstr ""
 
-#: part/bom.py:107
+#: order/views.py:862
+msgid "Edit Line Item"
+msgstr ""
+
+#: order/views.py:878
+msgid "Delete Line Item"
+msgstr ""
+
+#: order/views.py:883
+msgid "Deleted line item"
+msgstr ""
+
+#: part/bom.py:140
 #, python-brace-format
 msgid "Unsupported file format: {f}"
 msgstr ""
 
-#: part/bom.py:112
+#: part/bom.py:145
 msgid "Error reading BOM file (invalid data)"
 msgstr ""
 
-#: part/bom.py:114
+#: part/bom.py:147
 msgid "Error reading BOM file (incorrect row size)"
 msgstr ""
 
-#: part/forms.py:37
+#: part/forms.py:37 stock/forms.py:91
+msgid "File Format"
+msgstr ""
+
+#: part/forms.py:37 stock/forms.py:91
+msgid "Select output file format"
+msgstr ""
+
+#: part/forms.py:39
+msgid "Cascading"
+msgstr ""
+
+#: part/forms.py:39
+msgid "Download cascading / multi-level BOM"
+msgstr ""
+
+#: part/forms.py:58
 msgid "Confirm that the BOM is correct"
 msgstr ""
 
-#: part/forms.py:49
+#: part/forms.py:70
 msgid "Select BOM file to upload"
 msgstr ""
 
-#: part/forms.py:73
+#: part/forms.py:94
 msgid "Select part category"
 msgstr ""
 
-#: part/forms.py:81
+#: part/forms.py:102
 msgid "Perform 'deep copy' which will duplicate all BOM data for this part"
 msgstr ""
 
-#: part/forms.py:86
+#: part/forms.py:107
 msgid "Confirm part creation"
 msgstr ""
 
-#: part/forms.py:172
+#: part/forms.py:193
 msgid "Input quantity for price calculation"
 msgstr ""
 
-#: part/forms.py:175
+#: part/forms.py:196
 msgid "Select currency for price calculation"
 msgstr ""
 
-#: part/models.py:57
+#: part/models.py:59
 msgid "Default location for parts in this category"
 msgstr ""
 
-#: part/models.py:60
+#: part/models.py:62
 msgid "Default keywords for parts in this category"
 msgstr ""
 
-#: part/models.py:309
+#: part/models.py:323
 msgid "Part must be unique for name, IPN and revision"
 msgstr ""
 
-#: part/models.py:323
+#: part/models.py:337
 msgid "Part cannot be a template part if it is a variant of another part"
 msgstr ""
 
-#: part/models.py:324
+#: part/models.py:338
 msgid "Part cannot be a variant of another part if it is already a template"
 msgstr ""
 
-#: part/models.py:328 part/templates/part/detail.html:17
+#: part/models.py:342 part/templates/part/detail.html:17
 msgid "Part name"
 msgstr ""
 
-#: part/models.py:332
+#: part/models.py:346
 msgid "Is this part a template part?"
 msgstr ""
 
-#: part/models.py:341
+#: part/models.py:355
 msgid "Is this part a variant of another part?"
 msgstr ""
 
-#: part/models.py:343
+#: part/models.py:357
 msgid "Part description"
 msgstr ""
 
-#: part/models.py:345
+#: part/models.py:359
 msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
-#: part/models.py:350
+#: part/models.py:364
 msgid "Part category"
 msgstr ""
 
-#: part/models.py:352
+#: part/models.py:366
 msgid "Internal Part Number"
 msgstr ""
 
-#: part/models.py:354
+#: part/models.py:368
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:356
+#: part/models.py:370
 msgid "Link to extenal URL"
 msgstr ""
 
-#: part/models.py:362
+#: part/models.py:376
 msgid "Where is this item normally stored?"
 msgstr ""
 
-#: part/models.py:406
+#: part/models.py:420
 msgid "Default supplier part"
 msgstr ""
 
-#: part/models.py:409
+#: part/models.py:423
 msgid "Minimum allowed stock level"
 msgstr ""
 
-#: part/models.py:411
+#: part/models.py:425
 msgid "Stock keeping units for this part"
 msgstr ""
 
-#: part/models.py:413
+#: part/models.py:427
 msgid "Can this part be built from other parts?"
 msgstr ""
 
-#: part/models.py:415
+#: part/models.py:429
 msgid "Can this part be used to build other parts?"
 msgstr ""
 
-#: part/models.py:417
+#: part/models.py:431
 msgid "Does this part have tracking for unique items?"
 msgstr ""
 
-#: part/models.py:419
+#: part/models.py:433
 msgid "Can this part be purchased from external suppliers?"
 msgstr ""
 
-#: part/models.py:421
+#: part/models.py:435
 msgid "Can this part be sold to customers?"
 msgstr ""
 
-#: part/models.py:423
+#: part/models.py:437
 msgid "Is this part active?"
 msgstr ""
 
-#: part/models.py:425
+#: part/models.py:439
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr ""
 
-#: part/models.py:427
+#: part/models.py:441
 msgid "Part notes - supports Markdown formatting"
 msgstr ""
 
-#: part/models.py:429
+#: part/models.py:443
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:936
+#: part/models.py:948
 msgid "Select file to attach"
 msgstr ""
 
-#: part/models.py:938
+#: part/models.py:950
 msgid "File comment"
 msgstr ""
 
-#: part/models.py:993
+#: part/models.py:1005
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:998
+#: part/models.py:1010
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:1000
+#: part/models.py:1012
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:1026
+#: part/models.py:1038
 msgid "Parent Part"
 msgstr ""
 
-#: part/models.py:1028
+#: part/models.py:1040
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:1030
+#: part/models.py:1042
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:1054
+#: part/models.py:1066
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:1062
+#: part/models.py:1074
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:1068
+#: part/models.py:1080
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:1071
+#: part/models.py:1083
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:1074
+#: part/models.py:1086
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:1077
+#: part/models.py:1089
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:1079
+#: part/models.py:1091
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:1142
+#: part/models.py:1154
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr ""
 
-#: part/models.py:1149
+#: part/models.py:1161
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr ""
@@ -1028,7 +1248,7 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: part/templates/part/attachments.html:34
+#: part/templates/part/attachments.html:34 part/views.py:118
 msgid "Edit attachment"
 msgstr ""
 
@@ -1077,7 +1297,7 @@ msgstr ""
 msgid "Part Details"
 msgstr ""
 
-#: part/templates/part/detail.html:22 part/templates/part/part_base.html:85
+#: part/templates/part/detail.html:22 part/templates/part/part_base.html:75
 msgid "IPN"
 msgstr ""
 
@@ -1181,34 +1401,42 @@ msgstr ""
 msgid "This part is not active"
 msgstr ""
 
-#: part/templates/part/part_base.html:47
+#: part/templates/part/part_base.html:37
 msgid "Star this part"
 msgstr ""
 
-#: part/templates/part/part_base.html:53
+#: part/templates/part/part_base.html:43
 msgid "Show pricing information"
 msgstr ""
 
-#: part/templates/part/part_base.html:105
+#: part/templates/part/part_base.html:95
 msgid "Available Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:100
 msgid "In Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:131
+#: part/templates/part/part_base.html:121
 msgid "Build Status"
 msgstr ""
 
-#: part/templates/part/part_base.html:135
+#: part/templates/part/part_base.html:125
 msgid "Can Build"
 msgstr ""
 
-#: part/templates/part/part_base.html:140
+#: part/templates/part/part_base.html:130
 msgid "Underway"
 msgstr ""
 
+#: part/templates/part/part_thumb.html:16
+msgid "Select from existing images"
+msgstr ""
+
+#: part/templates/part/part_thumb.html:17
+msgid "Upload new image"
+msgstr ""
+
 #: part/templates/part/tabs.html:9
 msgid "Parameters"
 msgstr ""
@@ -1242,151 +1470,175 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
-#: part/views.py:77
+#: part/views.py:75
+msgid "Add part attachment"
+msgstr ""
+
+#: part/views.py:80
 msgid "Added attachment"
 msgstr ""
 
-#: part/views.py:119
+#: part/views.py:122
 msgid "Part attachment updated"
 msgstr ""
 
-#: part/views.py:196
+#: part/views.py:137
+msgid "Delete Part Attachment"
+msgstr ""
+
+#: part/views.py:143
+msgid "Deleted part attachment"
+msgstr ""
+
+#: part/views.py:151
+msgid "Set Part Category"
+msgstr ""
+
+#: part/views.py:199
 #, python-brace-format
 msgid "Set category for {n} parts"
 msgstr ""
 
-#: part/views.py:306
+#: part/views.py:234
+msgid "Create Variant"
+msgstr ""
+
+#: part/views.py:304
+msgid "Duplicate Part"
+msgstr ""
+
+#: part/views.py:309
 msgid "Copied part"
 msgstr ""
 
-#: part/views.py:414
+#: part/views.py:417
 msgid "Create new part"
 msgstr ""
 
-#: part/views.py:419
+#: part/views.py:422
 msgid "Created new part"
 msgstr ""
 
-#: part/views.py:609
+#: part/views.py:595
+msgid "Part QR Code"
+msgstr ""
+
+#: part/views.py:612
 msgid "Upload Part Image"
 msgstr ""
 
-#: part/views.py:614
+#: part/views.py:617 part/views.py:652
 msgid "Updated part image"
 msgstr ""
 
-#: part/views.py:623
+#: part/views.py:626
 msgid "Select Part Image"
 msgstr ""
 
-#: part/views.py:627
-msgid "Selected part image"
+#: part/views.py:655
+msgid "Part image not found"
 msgstr ""
 
-#: part/views.py:637
+#: part/views.py:666
 msgid "Edit Part Properties"
 msgstr ""
 
-#: part/views.py:659
+#: part/views.py:688
 msgid "Validate BOM"
 msgstr ""
 
-#: part/views.py:821
+#: part/views.py:850
 msgid "No BOM file provided"
 msgstr ""
 
-#: part/views.py:1082
+#: part/views.py:1111
 msgid "Enter a valid quantity"
 msgstr ""
 
-#: part/views.py:1106 part/views.py:1109
+#: part/views.py:1135 part/views.py:1138
 msgid "Select valid part"
 msgstr ""
 
-#: part/views.py:1115
+#: part/views.py:1144
 msgid "Duplicate part selected"
 msgstr ""
 
-#: part/views.py:1143
+#: part/views.py:1172
 msgid "Select a part"
 msgstr ""
 
-#: part/views.py:1147
+#: part/views.py:1176
 msgid "Specify quantity"
 msgstr ""
 
-#: part/views.py:1324
+#: part/views.py:1356
+msgid "Export Bill of Materials"
+msgstr ""
+
+#: part/views.py:1396
 msgid "Confirm Part Deletion"
 msgstr ""
 
-#: part/views.py:1331
+#: part/views.py:1403
 msgid "Part was deleted"
 msgstr ""
 
-#: part/views.py:1340
+#: part/views.py:1412
 msgid "Part Pricing"
 msgstr ""
 
-#: part/views.py:1462
+#: part/views.py:1534
 msgid "Create Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1470
+#: part/views.py:1542
 msgid "Edit Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1477
+#: part/views.py:1549
 msgid "Delete Part Parameter Template"
 msgstr ""
 
-#: part/views.py:1485
+#: part/views.py:1557
 msgid "Create Part Parameter"
 msgstr ""
 
-#: part/views.py:1535
+#: part/views.py:1607
 msgid "Edit Part Parameter"
 msgstr ""
 
-#: part/views.py:1549
+#: part/views.py:1621
 msgid "Delete Part Parameter"
 msgstr ""
 
-#: part/views.py:1565
+#: part/views.py:1637
 msgid "Edit Part Category"
 msgstr ""
 
-#: part/views.py:1600
+#: part/views.py:1672
 msgid "Delete Part Category"
 msgstr ""
 
-#: part/views.py:1606
+#: part/views.py:1678
 msgid "Part category was deleted"
 msgstr ""
 
-#: part/views.py:1614
+#: part/views.py:1686
 msgid "Create new part category"
 msgstr ""
 
-#: part/views.py:1665
+#: part/views.py:1737
 msgid "Create BOM item"
 msgstr ""
 
-#: part/views.py:1731
+#: part/views.py:1803
 msgid "Edit BOM item"
 msgstr ""
 
-#: part/views.py:1779
+#: part/views.py:1851
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: stock/forms.py:91
-msgid "File Format"
-msgstr ""
-
-#: stock/forms.py:91
-msgid "Select output file format"
-msgstr ""
-
 #: stock/forms.py:93
 msgid "Include stock items in sub locations"
 msgstr ""
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index bb1702c8a2..2b31740bd2 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -96,7 +96,7 @@ class PurchaseOrderCreate(AjaxCreateView):
     """ View for creating a new PurchaseOrder object using a modal form """
 
     model = PurchaseOrder
-    ajax_form_title = "Create Purchase Order"
+    ajax_form_title = _("Create Purchase Order")
     form_class = order_forms.EditPurchaseOrderForm
 
     def get_initial(self):
@@ -126,7 +126,7 @@ class PurchaseOrderEdit(AjaxUpdateView):
     """ View for editing a PurchaseOrder using a modal form """
 
     model = PurchaseOrder
-    ajax_form_title = 'Edit Purchase Order'
+    ajax_form_title = _('Edit Purchase Order')
     form_class = order_forms.EditPurchaseOrderForm
 
     def get_form(self):
@@ -146,7 +146,7 @@ class PurchaseOrderCancel(AjaxUpdateView):
     """ View for cancelling a purchase order """
 
     model = PurchaseOrder
-    ajax_form_title = 'Cancel Order'
+    ajax_form_title = _('Cancel Order')
     ajax_template_name = 'order/order_cancel.html'
     form_class = order_forms.CancelPurchaseOrderForm
 
@@ -179,7 +179,7 @@ class PurchaseOrderIssue(AjaxUpdateView):
     """ View for changing a purchase order from 'PENDING' to 'ISSUED' """
 
     model = PurchaseOrder
-    ajax_form_title = 'Issue Order'
+    ajax_form_title = _('Issue Order')
     ajax_template_name = "order/order_issue.html"
     form_class = order_forms.IssuePurchaseOrderForm
 
@@ -215,7 +215,7 @@ class PurchaseOrderComplete(AjaxUpdateView):
     form_class = order_forms.CompletePurchaseOrderForm
     model = PurchaseOrder
     ajax_template_name = "order/order_complete.html"
-    ajax_form_title = "Complete Order"
+    ajax_form_title = _("Complete Order")
     context_object_name = 'order'
 
     def get_context_data(self):
@@ -281,7 +281,7 @@ class PurchaseOrderReceive(AjaxUpdateView):
     """
 
     form_class = order_forms.ReceivePurchaseOrderForm
-    ajax_form_title = "Receive Parts"
+    ajax_form_title = _("Receive Parts")
     ajax_template_name = "order/receive_parts.html"
 
     # Where the parts will be going (selected in POST request)
@@ -445,7 +445,7 @@ class OrderParts(AjaxView):
 
     """
 
-    ajax_form_title = "Order Parts"
+    ajax_form_title = _("Order Parts")
     ajax_template_name = 'order/order_wizard/select_parts.html'
 
     # List of Parts we wish to order
@@ -744,7 +744,7 @@ class POLineItemCreate(AjaxCreateView):
     model = PurchaseOrderLineItem
     context_object_name = 'line'
     form_class = order_forms.EditPurchaseOrderLineItemForm
-    ajax_form_title = 'Add Line Item'
+    ajax_form_title = _('Add Line Item')
 
     def post(self, request, *arg, **kwargs):
 
@@ -859,7 +859,7 @@ class POLineItemEdit(AjaxUpdateView):
     model = PurchaseOrderLineItem
     form_class = order_forms.EditPurchaseOrderLineItemForm
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Edit Line Item'
+    ajax_form_title = _('Edit Line Item')
 
     def get_form(self):
         form = super().get_form()
@@ -875,10 +875,10 @@ class POLineItemDelete(AjaxDeleteView):
     """
 
     model = PurchaseOrderLineItem
-    ajax_form_title = 'Delete Line Item'
+    ajax_form_title = _('Delete Line Item')
     ajax_template_name = 'order/po_lineitem_delete.html'
     
     def get_data(self):
         return {
-            'danger': 'Deleted line item',
+            'danger': _('Deleted line item'),
         }
diff --git a/InvenTree/part/admin.py b/InvenTree/part/admin.py
index 6f9d2369e5..fc5727bd9d 100644
--- a/InvenTree/part/admin.py
+++ b/InvenTree/part/admin.py
@@ -131,11 +131,13 @@ class BomItemResource(ModelResource):
 
     level = Field(attribute='level', readonly=True)
 
-    part = Field(attribute='part', widget=widgets.ForeignKeyWidget(Part))
+    bom_id = Field(attribute='pk')
+
+    parent_part_id = Field(attribute='part', widget=widgets.ForeignKeyWidget(Part))
 
     parent_part_name = Field(attribute='part__full_name', readonly=True)
 
-    id = Field(attribute='sub_part', widget=widgets.ForeignKeyWidget(Part))
+    sub_part_id = Field(attribute='sub_part', widget=widgets.ForeignKeyWidget(Part))
 
     sub_part_name = Field(attribute='sub_part__full_name', readonly=True)
 
@@ -147,7 +149,12 @@ class BomItemResource(ModelResource):
         report_skipped = False
         clean_model_instances = True
 
-        exclude = ['checksum', ]
+        exclude = [
+            'checksum',
+            'id',
+            'part',
+            'sub_part',
+        ]
 
 
 class BomItemAdmin(ImportExportModelAdmin):
diff --git a/InvenTree/part/bom.py b/InvenTree/part/bom.py
index a1f8b5ec6a..85d7e23dbb 100644
--- a/InvenTree/part/bom.py
+++ b/InvenTree/part/bom.py
@@ -53,12 +53,18 @@ def ExportBom(part, fmt='csv', cascade=False):
 
     bom_items = []
 
+    uids = []
+
     def add_items(items, level):
         # Add items at a given layer
         for item in items:
 
             item.level = '-' * level
 
+            # Avoid circular BOM references
+            if item.pk in uids:
+                continue
+
             bom_items.append(item)
 
             if item.sub_part.assembly:
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 3a59db0cc6..d21a250c31 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -35,6 +35,7 @@ from InvenTree import helpers
 from InvenTree import validators
 from InvenTree.models import InvenTreeTree
 from InvenTree.fields import InvenTreeURLField
+from InvenTree.helpers import decimal2string
 
 from InvenTree.status_codes import BuildStatus, StockStatus, OrderStatus
 
@@ -1242,11 +1243,11 @@ class BomItem(models.Model):
 
         pmin, pmax = prange
 
-        # remove trailing zeros
-        pmin = pmin.normalize()
-        pmax = pmax.normalize()
-
         if pmin == pmax:
-            return str(pmin)
+            return decimal2string(pmin)
+
+        # Convert to better string representation
+        pmin = decimal2string(pmin)
+        pmax = decimal2string(pmax)
 
         return "{pmin} to {pmax}".format(pmin=pmin, pmax=pmax)
diff --git a/InvenTree/part/templates/part/allocation.html b/InvenTree/part/templates/part/allocation.html
index c87d71814b..913469997f 100644
--- a/InvenTree/part/templates/part/allocation.html
+++ b/InvenTree/part/templates/part/allocation.html
@@ -39,6 +39,9 @@
             {
                 title: 'Allocated',
                 sortable: false,
+                formatter: function(value, row, index, field) {
+                    return parseFloat(value);
+                },
             },
             {
                 title: 'Status',
diff --git a/InvenTree/part/templates/part/used_in.html b/InvenTree/part/templates/part/used_in.html
index 872288723e..bad93b17ec 100644
--- a/InvenTree/part/templates/part/used_in.html
+++ b/InvenTree/part/templates/part/used_in.html
@@ -53,6 +53,9 @@
                 sortable: true,
                 field: 'quantity',
                 title: 'Uses',
+                formatter: function(value, row, index, field) {
+                    return parseFloat(value);
+                },
             }
 
         ],
diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 0a111bfb0e..d508452e80 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -27,7 +27,7 @@ def inrange(n, *args, **kwargs):
 @register.simple_tag()
 def multiply(x, y, *args, **kwargs):
     """ Multiply two numbers together """
-    return x * y
+    return decimal2string(x * y)
 
 
 @register.simple_tag()
@@ -40,7 +40,7 @@ def add(x, y, *args, **kwargs):
 def part_allocation_count(build, part, *args, **kwargs):
     """ Return the total number of <part> allocated to <build> """
 
-    return build.getAllocatedQuantity(part)
+    return decimal2string(build.getAllocatedQuantity(part))
 
 
 @register.simple_tag()
diff --git a/InvenTree/part/test_part.py b/InvenTree/part/test_part.py
index 2d3e5408bd..c7c3c014a1 100644
--- a/InvenTree/part/test_part.py
+++ b/InvenTree/part/test_part.py
@@ -1,6 +1,7 @@
 # Tests for the Part model
 
 # -*- coding: utf-8 -*-
+
 from __future__ import unicode_literals
 
 from django.test import TestCase
@@ -16,7 +17,7 @@ class TemplateTagTest(TestCase):
     """ Tests for the custom template tag code """
 
     def test_multiply(self):
-        self.assertEqual(inventree_extras.multiply(3, 5), 15)
+        self.assertEqual(int(inventree_extras.multiply(3, 5)), 15)
 
     def test_version(self):
         self.assertEqual(type(inventree_extras.inventree_version()), str)
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 584c8fe62f..5bdb101398 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -72,7 +72,7 @@ class PartAttachmentCreate(AjaxCreateView):
     """
     model = PartAttachment
     form_class = part_forms.EditPartAttachmentForm
-    ajax_form_title = "Add part attachment"
+    ajax_form_title = _("Add part attachment")
     ajax_template_name = "modal_form.html"
 
     def get_data(self):
@@ -115,7 +115,7 @@ class PartAttachmentEdit(AjaxUpdateView):
     model = PartAttachment
     form_class = part_forms.EditPartAttachmentForm
     ajax_template_name = 'modal_form.html'
-    ajax_form_title = 'Edit attachment'
+    ajax_form_title = _('Edit attachment')
     
     def get_data(self):
         return {
@@ -134,13 +134,13 @@ class PartAttachmentDelete(AjaxDeleteView):
     """ View for deleting a PartAttachment """
 
     model = PartAttachment
-    ajax_form_title = "Delete Part Attachment"
+    ajax_form_title = _("Delete Part Attachment")
     ajax_template_name = "part/attachment_delete.html"
     context_object_name = "attachment"
 
     def get_data(self):
         return {
-            'danger': 'Deleted part attachment'
+            'danger': _('Deleted part attachment')
         }
 
 
@@ -148,7 +148,7 @@ class PartSetCategory(AjaxUpdateView):
     """ View for settings the part category for multiple parts at once """
 
     ajax_template_name = 'part/set_category.html'
-    ajax_form_title = 'Set Part Category'
+    ajax_form_title = _('Set Part Category')
     form_class = part_forms.SetPartCategoryForm
 
     category = None
@@ -231,7 +231,7 @@ class MakePartVariant(AjaxCreateView):
     model = Part
     form_class = part_forms.EditPartForm
 
-    ajax_form_title = 'Create Variant'
+    ajax_form_title = _('Create Variant')
     ajax_template_name = 'part/variant_part.html'
 
     def get_part_template(self):
@@ -301,7 +301,7 @@ class PartDuplicate(AjaxCreateView):
     model = Part
     form_class = part_forms.EditPartForm
 
-    ajax_form_title = "Duplicate Part"
+    ajax_form_title = _("Duplicate Part")
     ajax_template_name = "part/copy_part.html"
 
     def get_data(self):
@@ -592,7 +592,7 @@ class PartDetail(DetailView):
 class PartQRCode(QRCodeView):
     """ View for displaying a QR code for a Part object """
 
-    ajax_form_title = "Part QR Code"
+    ajax_form_title = _("Part QR Code")
 
     def get_qr_data(self):
         """ Generate QR code data for the Part """
diff --git a/InvenTree/stock/templates/stock/item_notes.html b/InvenTree/stock/templates/stock/item_notes.html
index a5abd13781..c97830a59c 100644
--- a/InvenTree/stock/templates/stock/item_notes.html
+++ b/InvenTree/stock/templates/stock/item_notes.html
@@ -35,7 +35,9 @@
 <hr>
 <div class='panel panel-default'>
     <div class='panel-content'>
+        {% if item.notes %}
         {{ item.notes | markdownify }}
+        {% endif %}
     </div>
 </div>
 
diff --git a/InvenTree/stock/templates/stock/tracking.html b/InvenTree/stock/templates/stock/tracking.html
deleted file mode 100644
index ecd9772897..0000000000
--- a/InvenTree/stock/templates/stock/tracking.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "stock/stock_app_base.html" %}
-{% load static %}
-
-{% block content %}
-
-<h3>Stock list here!</h3>
-
-<table class='table table-striped table-condensed' data-toolbar='#button-toolbar' id='tracking-table'>
-</table>
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-    loadStockTrackingTable($("#tracking-table"), {
-        params: function(p) {
-            return {
-                ordering: '-date',
-            };
-        },
-        partColumn: true,
-        url: "{% url 'api-stock-track' %}", 
-    });
-
-{% endblock %}
\ No newline at end of file