Oliver Walters 3a702266e6 Merge remote-tracking branch 'inventree/master' into build-fixes ... # Conflicts: # InvenTree/InvenTree/views.py # InvenTree/build/views.py # InvenTree/locale/de/LC_MESSAGES/django.po # InvenTree/locale/en/LC_MESSAGES/django.po # InvenTree/locale/es/LC_MESSAGES/django.po # InvenTree/order/views.py # InvenTree/part/api.py # InvenTree/part/views.py # InvenTree/templates/js/bom.js		2020-10-30 22:44:25 +11:00
..
barcode.js	Rename javascript files from .html to .js	2020-10-28 18:13:02 +11:00
bom.js	Merge remote-tracking branch 'inventree/master' into build-fixes	2020-10-30 22:44:25 +11:00
build.js	Tweaks	2020-10-29 09:45:42 +11:00
company.js	Add function makeIconBadge for tables	2020-10-29 13:18:45 +11:00
order.js	Rename javascript files from .html to .js	2020-10-28 18:13:02 +11:00
part.js	Tweaks to part.js	2020-10-29 13:20:42 +11:00
stock.js	Rename javascript files from .html to .js	2020-10-28 18:13:02 +11:00
table_filters.js	Merge remote-tracking branch 'inventree/master' into build-fixes	2020-10-29 15:23:51 +11:00