Oliver 2a8f3a2918 Merge remote-tracking branch 'origin/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-05 14:03:50 +10:00

..

barcodes

removes all lines consisting only of spaces

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

build

Cleanup old forms

2021-07-01 14:25:14 +10:00

common

makes currency selection human-readable

2021-07-02 20:02:15 +02:00

company

Use custom currency choices

2021-07-03 12:45:59 +10:00

img_source

…

InvenTree

Increment API version

2021-07-03 20:37:50 +10:00

label

Annotate models with their API list view

2021-06-25 00:17:58 +10:00

locale

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

2021-07-05 14:02:45 +10:00

order

Refactor SOLineItemCreate view

2021-07-03 21:56:29 +10:00

part

Merge pull request #1716 from SchrodingersGat/drf-api-forms

2021-07-03 22:14:26 +10:00

plugins

removes all lines consisting only of spaces

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

report

Annotate models with their API list view

2021-06-25 00:17:58 +10:00

script

removes all lines consisting only of spaces

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

stock

PEP fix

2021-07-03 20:34:30 +10:00

templates

Merge pull request #1716 from SchrodingersGat/drf-api-forms

2021-07-03 22:14:26 +10:00

users

Refactor forms for sales orders

2021-07-03 00:14:36 +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

…