{% trans "Completed lines" %}:
-
-
\ No newline at end of file
diff --git a/InvenTree/build/views.py b/InvenTree/build/views.py
index a1dd802c4a..450f676b4c 100644
--- a/InvenTree/build/views.py
+++ b/InvenTree/build/views.py
@@ -646,6 +646,16 @@ class BuildItemCreate(AjaxCreateView):
"""
pass
+ # If the sub_part is supplied, limit to matching stock items
+ part_id = self.get_param('part')
+
+ if part_id:
+ try:
+ self.part = Part.objects.get(pk=part_id)
+
+ except (ValueError, Part.DoesNotExist):
+ pass
+
# If the output stock item is specified, hide the input field
output_id = form['install_into'].value()
@@ -657,15 +667,10 @@ class BuildItemCreate(AjaxCreateView):
except (ValueError, StockItem.DoesNotExist):
pass
- # If the sub_part is supplied, limit to matching stock items
- part_id = self.get_param('part')
-
- if part_id:
- try:
- self.part = Part.objects.get(pk=part_id)
-
- except (ValueError, Part.DoesNotExist):
- pass
+ else:
+ # If the output is not specified, but we know that the part is non-trackable, hide the install_into field
+ if self.part and not self.part.trackable:
+ form.fields['install_into'].widget = HiddenInput()
if self.build and self.part:
available_items = self.build.getAvailableStockItems(part=self.part, output=self.output)
diff --git a/InvenTree/order/views.py b/InvenTree/order/views.py
index d2d02bb2c9..e4645e0ae5 100644
--- a/InvenTree/order/views.py
+++ b/InvenTree/order/views.py
@@ -91,7 +91,7 @@ class SalesOrderDetail(InvenTreeRoleMixin, DetailView):
class PurchaseOrderAttachmentCreate(AjaxCreateView):
"""
- View for creating a new PurchaseOrderAtt
+ View for creating a new PurchaseOrderAttachment
"""
model = PurchaseOrderAttachment
diff --git a/InvenTree/templates/js/build.js b/InvenTree/templates/js/build.js
index fd4d05e35f..a614ef348c 100644
--- a/InvenTree/templates/js/build.js
+++ b/InvenTree/templates/js/build.js
@@ -32,11 +32,15 @@ function newBuildOrder(options={}) {
}
-function makeBuildOutputActionButtons(output, buildId) {
+function makeBuildOutputActionButtons(output, buildInfo) {
/* Generate action buttons for a build output.
*/
- var outputId = output.pk;
+ var outputId = 'untracked';
+
+ if (output) {
+ outputId = output.pk;
+ }
var panel = `#allocation-panel-${outputId}`;
@@ -58,16 +62,6 @@ function makeBuildOutputActionButtons(output, buildId) {
}
);
- if (output.quantity > 1) {
- html += makeIconButton(
- 'fa-random icon-blue', 'button-output-split', outputId,
- '{% trans "Split build output into separate items" %}',
- {
- disabled: true
- }
- );
- }
-
// Add a button to "complete" the particular build output
html += makeIconButton(
'fa-tools icon-green', 'button-output-complete', outputId,
@@ -139,7 +133,7 @@ function makeBuildOutputActionButtons(output, buildId) {
}
-function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
+function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
/*
* Load the "allocation table" for a particular build output.
*
@@ -151,10 +145,25 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
* -- table: The #id of the table (will be auto-calculated if not provided)
*/
- var outputId = output.pk;
+ var buildId = buildInfo.pk;
+ var partId = buildInfo.part;
- var table = options.table || `#allocation-table-${outputId}`;
+ var outputId = null;
+
+ if (output) {
+ outputId = output.pk;
+ }
+ var table = options.table;
+
+ if (options.table == null) {
+ if (outputId != null) {
+ table = `#allocation-table-${outputId}`;
+ } else {
+ table = `#allocation-table-untracked`;
+ }
+ }
+
function reloadTable() {
// Reload the entire build allocation table
$(table).bootstrapTable('refresh');
@@ -163,7 +172,14 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
function requiredQuantity(row) {
// Return the requied quantity for a given row
- return row.quantity * output.quantity;
+ if (output) {
+ // Tracked stock allocated against a particular BuildOutput
+ return row.quantity * output.quantity;
+ } else {
+ // Untrack stock allocated against the build
+ return row.quantity * (buildInfo.quantity - buildInfo.completed);
+ }
+
}
function sumAllocations(row) {
@@ -199,16 +215,33 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
install_into: outputId,
},
secondary: [
- {
- field: 'stock_item',
- label: '{% trans "New Stock Item" %}',
- title: '{% trans "Create new Stock Item" %}',
- url: '{% url "stock-item-create" %}',
- data: {
- part: pk,
+ {
+ field: 'stock_item',
+ label: '{% trans "New Stock Item" %}',
+ title: '{% trans "Create new Stock Item" %}',
+ url: '{% url "stock-item-create" %}',
+ data: {
+ part: pk,
+ },
},
- },
- ]
+ ],
+ callback: [
+ {
+ field: 'stock_item',
+ action: function(value) {
+ inventreeGet(
+ `/api/stock/${value}/`, {},
+ {
+ success: function(response) {
+ var available = response.quantity - response.allocated;
+
+ console.log('available: ' + available);
+ }
+ }
+ )
+ }
+ }
+ ]
});
});
@@ -253,6 +286,7 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
queryParams: {
part: partId,
sub_part_detail: true,
+ trackable: outputId != null,
},
formatNoMatches: function() {
return '{% trans "No BOM items found" %}';
@@ -262,6 +296,7 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
onPostBody: setupCallbacks,
onLoadSuccess: function(tableData) {
// Once the BOM data are loaded, request allocation data for this build output
+
inventreeGet('/api/build/item/',
{
build: buildId,
@@ -293,9 +328,14 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
// Now update the allocations for each row in the table
for (var key in allocations) {
+
// Select the associated row in the table
var tableRow = $(table).bootstrapTable('getRowByUniqueId', key);
+ if (!tableRow) {
+ continue;
+ }
+
// Set the allocation list for that row
tableRow.allocations = allocations[key];
@@ -303,8 +343,14 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
var allocatedQuantity = sumAllocations(tableRow);
// Is this line item fully allocated?
- if (allocatedQuantity >= (tableRow.quantity * output.quantity)) {
- allocatedLines += 1;
+ if (output) {
+ if (allocatedQuantity >= (tableRow.quantity * output.quantity)) {
+ allocatedLines += 1;
+ }
+ } else {
+ if (allocatedQuantity >= (tableRow.quantity * (buildInfo.quantity - buildInfo.completed))) {
+ allocatedLines += 1;
+ }
}
// Push the updated row back into the main table
@@ -323,7 +369,7 @@ function loadBuildOutputAllocationTable(buildId, partId, output, options={}) {
// Update the available actions for this build output
- makeBuildOutputActionButtons(output, buildId);
+ makeBuildOutputActionButtons(output, buildInfo);
}
}
);