Oliver Walters 9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q ...

# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html

2021-04-07 22:29:47 +10:00

..

fixtures

Add missing fixture for settings

2020-11-12 14:54:03 +11:00

migrations

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

templates/common

Use a checkbox input when editing a boolean setting

2020-10-25 21:00:06 +11:00

__init__.py

startapp common

2019-09-03 08:30:14 +10:00

admin.py

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

api.py

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

apps.py

Add more invoke commands:

2020-11-12 13:31:27 +11:00

forms.py

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

models.py

Merge remote-tracking branch 'upstream/master' into django-q

2021-04-07 22:29:47 +10:00

serializers.py

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

settings.py

Add option to enable / disable stock expiry feature

2021-01-05 08:50:07 +11:00

test_views.py

Mayyyyyyyyyyyyybe?

2020-11-13 21:37:39 +11:00

tests.py

Update unit testing

2021-01-03 23:33:47 +11:00

urls.py

Remove common_currency model entirely

2020-11-11 00:21:06 +11:00

views.py

made translation lazy

2021-04-04 22:47:01 +02:00