Oliver Walters 0134597747 Merge remote-tracking branch 'inventree/master' into label-api ...

# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po

2021-01-14 23:56:23 +11:00

..

fixtures

Improve unit testing for StockItem API

2021-01-04 01:22:43 +11:00

migrations

Add "expiry_date" field to StockItem model

2021-01-03 23:56:35 +11:00

templates/stock

Merge remote-tracking branch 'inventree/master' into label-api

2021-01-14 23:56:23 +11:00

__init__.py

PEP fixes

2020-04-22 13:21:45 +10:00

admin.py

Remove defunct 'build_order' field from StockItem model

2020-11-10 20:12:39 +11:00

api.py

Filter StockItem API by staleness

2021-01-06 22:20:54 +11:00

apps.py

Added stock page

2017-03-27 21:05:19 +11:00

forms.py

Rearrange button options for StockItem

2021-01-07 00:18:18 +11:00

models.py

Add simplified 'barcode' function for StockItem

2021-01-12 00:22:58 +11:00

serializers.py

Add stocktake_date field to stock API, and to stock table

2021-01-14 11:29:35 +11:00

test_api.py

Fixed unit test

2021-01-06 23:38:01 +11:00

test_views.py

Exclude expired stock from builds

2021-01-06 21:00:45 +11:00

tests.py

Improve unit testing for StockItem API

2021-01-04 01:22:43 +11:00

urls.py

Remove unused views

2021-01-09 21:55:05 +11:00

views.py

Merge remote-tracking branch 'inventree/master' into label-api

2021-01-14 23:56:23 +11:00