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
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
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
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
Oliver
62682c686b
Merge pull request #1629 from inventree/l10_crowdin
...
New Crowdin updates
2021-06-06 22:21:35 +10:00
36ff21f11e
hide supply part price on start
2021-06-06 14:21:08 +02:00
Oliver
e977be9c1b
Merge pull request #1630 from inventree/dependabot/pip/django-3.2.1
...
Bump django from 3.2 to 3.2.1
2021-06-06 22:20:47 +10: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
Oliver
8301eb3be3
Merge pull request #1633 from matmair/money-format
...
Money format
2021-06-06 22:12:55 +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
