Oliver Walters
7dd63b36da
Simplify dockerfile / docker-compose
...
- Single data volume now also includes 'static' files
- InvenTree source repo is now cloned into /home/inventree (to match the "dev" image)
2021-06-16 22:36:05 +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
058fc57ff1
Serve media files via nginx
2021-06-16 20:57:24 +10:00
Oliver Walters
0821ead024
Only provide static redirects if in DEBUG mode
2021-06-15 23:51:37 +10:00
Oliver Walters
632ea593fe
Fix default port association
2021-06-15 23:40:50 +10:00
Oliver Walters
8bfdb0bec6
Comment fix
2021-06-15 23:19:50 +10:00
Oliver Walters
01328075ea
All "development" related stuff now goes under ./dev
...
- Update dev-config.env
- Update docker-compose.dev.yml
- Development target of Dockerfile no longer creates any folders
- Update entry point scripts
2021-06-15 23:05:03 +10:00
Oliver
8da00c6106
Merge pull request #1662 from eeintech/fix-1661
...
Add "Purchase Price" to stock table
2021-06-15 07:20:03 +10:00
eeintech
08fbdf660b
Fix for #1661
2021-06-14 14:19:10 -04:00
Oliver
8e6691ce36
Merge pull request #1658 from matmair/fix-whitespace-paths
...
fix whitespaces in paths
2021-06-14 21:39:51 +10:00
Matthias
ec19d77523
fix whitespaces in paths
2021-06-13 20:08:42 +02:00
Matthias
447a7dd4e4
style fix
2021-06-13 15:04:57 +02:00
Matthias
3f04a57452
added test for internal prices
2021-06-13 15:01:03 +02:00
Matthias
3fb95bea7e
added test for sell price breaks
2021-06-13 13:31:31 +02:00
Oliver
2e1db9d0bc
Merge pull request #1653 from matmair/display-serial
...
display latest serial on all part-views #1648
2021-06-12 08:01:34 +10:00
Matthias
c0e50128dd
display latest serial on all part-views #1648
2021-06-11 23:43:23 +02:00
Oliver
deb8f0df2a
Merge pull request #1652 from inventree/dependabot/pip/django-3.2.4
...
Build(deps): Bump django from 3.2.2 to 3.2.4
2021-06-11 08:15:41 +10:00
dependabot[bot]
0bc190bca5
Build(deps): Bump django from 3.2.2 to 3.2.4
...
Bumps [django](https://github.com/django/django ) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.2...3.2.4 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-10 17:36:17 +00:00
Oliver
3a91156b01
Merge pull request #1651 from inventree/dependabot/pip/django-3.2.2
...
Build(deps): Bump django from 3.2.1 to 3.2.2
2021-06-10 11:05:47 +10:00
dependabot[bot]
6e2abc4cde
Build(deps): Bump django from 3.2.1 to 3.2.2
...
Bumps [django](https://github.com/django/django ) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/django/django/releases )
- [Commits](https://github.com/django/django/compare/3.2.1...3.2.2 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 17:26:23 +00: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
0076c0cec5
Merge pull request #1649 from SchrodingersGat/typo-fix
...
Fix typo in getStockItemThumbnail
2021-06-09 11:54:50 +10:00
Oliver
fb52115fe3
Merge pull request #1646 from inventree/dependabot/pip/pillow-8.2.0
...
Build(deps): Bump pillow from 8.1.1 to 8.2.0
2021-06-09 11:47:03 +10:00
Oliver
0c14457598
Fix typo in getStockItemThumbnail
2021-06-09 11:16:37 +10:00
Oliver
120c371a11
Merge pull request #1647 from SchrodingersGat/thumbnail-error-catch
...
BuildItemSerializer: Handle errors when thumbnail is not found
2021-06-09 10:02:42 +10:00
Oliver
9fd212d1b2
BuildItemSerializer: Handle errors when thumbnail is not found
2021-06-09 09:41:27 +10:00
dependabot[bot]
2a059f345e
Build(deps): Bump pillow from 8.1.1 to 8.2.0
...
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases )
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst )
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0 )
---
updated-dependencies:
- dependency-name: pillow
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 19:49:34 +00:00
Oliver
fd63e49e60
Merge pull request #1644 from SchrodingersGat/test-table-fix
...
Stock Test: Fix display of stock test table
2021-06-08 20:27:06 +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
Matthias
74c4c559e4
clearer wording for internal price settings
2021-06-07 05:33:20 +02:00
Matthias
4f3bfe569a
added in internal prices in price calculations
2021-06-07 05:25:13 +02:00
Matthias
0e8a97acb0
added permissions
2021-06-07 05:23:13 +02:00
Matthias
37c0025399
settings for internal prices added
2021-06-07 04:58:37 +02:00
Matthias
62638f76ed
fixing wrong page title
2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c
added internal price to part_pricing
2021-06-07 00:19:37 +02:00
Matthias
27282c8049
Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price
2021-06-06 18:15:41 +02:00
Matthias
413fa2e842
merging in sidebar icon changes fr upstream
2021-06-06 17:50:13 +02:00
Matthias
5a869d247f
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
2021-06-06 17:46:33 +02:00
Matthias
d70b4bcabb
refactor
2021-06-06 17:44:02 +02:00
Matthias
4f7edac213
back button
2021-06-06 17:43:16 +02:00
Matthias
a535f8df42
hide scrollbar if not needed
2021-06-06 16:40:51 +02:00
Matthias
a2a2c61e31
refactor and fix rendering on error
2021-06-06 16:36:01 +02:00
Matthias
7439f72ab1
hide error messagre on error
2021-06-06 16:33:19 +02:00
Matthias
5e6919f14e
hide error message
2021-06-06 16:32:46 +02:00
Oliver
534fd491c1
Merge pull request #1637 from SchrodingersGat/lib-update
...
Update django-import-export to 2.5.0
2021-06-07 00:30:03 +10:00
Oliver
d2e35426c2
Merge pull request #1636 from SchrodingersGat/l10-merge
...
L10 merge
2021-06-07 00:13:18 +10:00
Oliver
172700da10
Update django-import-export to 2.5.0
...
- Fixes an export error introduced after updating to latest django
2021-06-07 00:12:52 +10:00
Matthias
ded68bb4f6
change titel with modal submit
2021-06-06 16:09:51 +02:00
Matthias
35451248c2
reseting modal on open
2021-06-06 15:25:56 +02:00