2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-07 07:48:50 +00:00

4894 Commits

Author SHA1 Message Date
Oliver Walters
513449e13c Whoops, missed one 2021-06-16 23:03:38 +10:00
Oliver Walters
725d26d76f Fix default paths in InvenTree settings 2021-06-16 23:03:09 +10:00
Oliver Walters
acd7322ff0 Files under /media require session to be authenticated
References:

- https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/apache-auth/
- https://stackoverflow.com/questions/46421589/nginx-location-and-django-auth
- https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/
- https://pawamoy.github.io/posts/django-auth-server-for-shiny/
2021-06-16 21:30:25 +10:00
Oliver Walters
0821ead024 Only provide static redirects if in DEBUG mode 2021-06-15 23:51:37 +10:00
eeintech
08fbdf660b Fix for #1661 2021-06-14 14:19:10 -04:00
447a7dd4e4 style fix 2021-06-13 15:04:57 +02:00
3f04a57452 added test for internal prices 2021-06-13 15:01:03 +02:00
3fb95bea7e added test for sell price breaks 2021-06-13 13:31:31 +02:00
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
Nigel
f8e4a5ac2e
test: improve coverage of new get_destination 2021-06-09 11:04:42 -06:00
Nigel
cd07ea835d
feat(purchase orders): show the preferred location for each PO Line
Adds the ability for the Purchaser to specify where the item is
intentended to go when received.  If the Purchaser does not set a
preferred location, then the default location for the part is displayed.
If the item is received them where it was actually placed is shown.

NOTE: if an item is split when received only one of the resulting
StockItem location is used.

Fixes #1467
Addresses some of the requests in #551
2021-06-09 09:06:03 -06:00
Oliver
0c14457598 Fix typo in getStockItemThumbnail 2021-06-09 11:16:37 +10:00
Oliver
9fd212d1b2 BuildItemSerializer: Handle errors when thumbnail is not found 2021-06-09 09:41:27 +10:00
Oliver
3aadf94a9c Stock Test: Fix display of stock test table
- Incorrect parent node was set
2021-06-08 16:15:40 +10:00
74c4c559e4 clearer wording for internal price settings 2021-06-07 05:33:20 +02:00
4f3bfe569a added in internal prices in price calculations 2021-06-07 05:25:13 +02:00
0e8a97acb0 added permissions 2021-06-07 05:23:13 +02:00
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19:37 +02:00
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +02:00
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +02:00
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
4f7edac213 back button 2021-06-06 17:43:16 +02:00
a535f8df42 hide scrollbar if not needed 2021-06-06 16:40:51 +02:00
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Oliver
5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge
# 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-06-06 22:27:27 +10:00
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style
same nav sidebar distance for everything
2021-06-06 22:14:20 +10:00
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02:00
81f00753c6 style 2021-06-05 17:24:04 +02:00
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
daf3d06cf0 added in optional matches 2021-06-05 01:19:12 +02:00
eeintech
74bd975a0b Revert back to form_list
Moved OrderMatchItemForm to forms.py
2021-06-04 13:41:07 -04:00
Oliver
3e9adec4ff Fix: New translations django.po from Crowdin 2021-06-04 03:03:42 +10:00
Oliver
6f3593220a Fix: New translations django.po from Crowdin 2021-06-04 02:08:23 +10:00