inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-30 18:50:53 +00:00
Code Activity

Merge branch 'master' into partial-shipment

Browse Source 
# Conflicts:
#	InvenTree/build/templates/build/build_base.html
#	InvenTree/order/templates/order/order_base.html
#	InvenTree/order/templates/order/sales_order_base.html
#	InvenTree/order/templates/order/sales_order_detail.html
#	InvenTree/order/templates/order/so_navbar.html
This commit is contained in:
Oliver
2021-10-30 23:44:06 +11:00
parent f32dfb01a2 2a58ad97dc
commit eaa315e726
251 changed files with 72023 additions and 5855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/js/translated/build.js
View File

@ -34,8 +34,8 @@ function buildFormFields() {
reference: {
prefix: global_settings.BUILDORDER_REFERENCE_PREFIX,
},
title: {},
part: {},
title: {},
quantity: {},
parent: {
filters: {
@ -937,7 +937,10 @@ function loadBuildOutputAllocationTable(buildInfo, output, options={}) {
var progress = makeProgressBar(
allocatedLines,
totalLines
totalLines,
{
max_width: '150px',
}
);
build_progress.html(progress);