Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
Oliver Walters 2021-02-22 16:48:00 +11:00
parent bf51e1bfb1
commit 7d54997cb8
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
InvenTree/label/apps.py
View File

@ -70,6 +70,8 @@ class LabelConfig(AppConfig):
'file': 'qr.html',
'name': 'QR Code',
'description': 'Simple QR code label',
'width': 24,
'height': 24,
},
]
@ -116,7 +118,9 @@ class LabelConfig(AppConfig):
description=label['description'],
label=filename,
filters='',
enabled=True
enabled=True,
width=label['width'],
height=label['height'],
)
except:
pass
@ -156,11 +160,15 @@ class LabelConfig(AppConfig):
'file': 'qr.html',
'name': 'QR Code',
'description': 'Simple QR code label',
'width': 24,
'height': 24,
},
{
'file': 'qr_and_text.html',
'name': 'QR and text',
'description': 'Label with QR code and name of location',
'width': 50,
'height': 24,
}
]
@ -207,7 +215,9 @@ class LabelConfig(AppConfig):
description=label['description'],
label=filename,
filters='',
enabled=True
enabled=True,
width=label['width'],
height=label['height'],
)
except:
pass

2
InvenTree/label/templates/label/stocklocation/qr_and_text.html
View File

@ -16,7 +16,7 @@
font-family: Arial, Helvetica, sans-serif;
display: inline;
position: absolute;
left: {{ width }},
left: {{ height }}mm;
top: 2mm;
}

12
InvenTree/templates/js/label.js
View File

@ -114,6 +114,18 @@ function selectLabel(labels, items, options={}) {
* (via AJAX) from the server.
*/
// If only a single label template is provided,
// just run with that!
if (labels.length == 1) {
if (options.success) {
options.success(labels[0].pk);
}
return;
}
var modal = options.modal || '#modal-form';
var label_list = makeOptionsList(