Oliver bb4a53bb81 Merge remote-tracking branch 'inventree/master' into l10 ...

# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po

2021-07-02 21:48:49 +10:00

..

barcodes

removes all lines consisting only of spaces

2021-05-06 12:11:38 +02:00

build

Reduce noise in logs

2021-06-22 09:32:36 +10:00

common

migration for file-based currency setting

2021-07-01 18:20:39 +02:00

company

added clean migration steps for all price fields

2021-07-01 07:11:15 +02:00

img_source

…

InvenTree

style fixes

2021-07-01 10:45:33 +02:00

label

Implements custom naming for generated labels

2021-05-13 13:40:40 +10:00

locale

Merge remote-tracking branch 'inventree/l10_crowdin' into l10

2021-07-02 21:48:09 +10:00

order

added clean migration steps for all price fields

2021-07-01 07:11:15 +02:00

part

added clean migration steps for all price fields

2021-07-01 07:11:15 +02:00

plugins

removes all lines consisting only of spaces

2021-05-06 12:11:38 +02:00

report

Implements custom naming for generated labels

2021-05-13 13:40:40 +10:00

script

removes all lines consisting only of spaces

2021-05-06 12:11:38 +02:00

stock

added clean migration steps for all price fields

2021-07-01 07:11:15 +02:00

templates

setting for default currency

2021-06-30 23:35:57 +02:00

users

Fixes:

2021-06-23 10:28:21 +10:00

config_template.yaml

Merge branch 'master' of https://github.com/inventree/InvenTree into part-import

2021-06-18 23:10:59 +02:00

gunicorn.conf.py

PEP fix

2020-12-14 10:44:38 +11:00

manage.py

…