f8e4a5ac2e
test: improve coverage of new get_destination
2021-06-09 11:04:42 -06:00
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
481a056327
Merge remote-tracking branch 'inventree/l10_crowdin' into l10
...
# Conflicts:
# InvenTree/locale/de/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-09 16:18:13 +10:00
fae90d19d5
Merge remote-tracking branch 'inventree/master'
2021-06-09 16:16:09 +10:00
adfbcf6055
updated translation base
2021-06-09 01:56:02 +00:00
0076c0cec5
Merge pull request #1649 from SchrodingersGat/typo-fix
...
Fix typo in getStockItemThumbnail
2021-06-09 11:54:50 +10:00
bde2902798
updated translation base
2021-06-09 01:48:18 +00:00
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
0c14457598
Fix typo in getStockItemThumbnail
2021-06-09 11:16:37 +10:00
cd2fcdd436
Fix: New translations django.po from Crowdin
2021-06-09 10:23:03 +10:00
96776fc9fe
Fix: New translations django.po from Crowdin
2021-06-09 10:23:02 +10:00
a1b48428dd
Fix: New translations django.po from Crowdin
2021-06-09 10:22:59 +10:00
3e9014646f
Fix: New translations django.po from Crowdin
2021-06-09 10:22:58 +10:00
1a7eebb7ab
Fix: New translations django.po from Crowdin
2021-06-09 10:22:56 +10:00
b8cd0d52d9
Fix: New translations django.po from Crowdin
2021-06-09 10:22:55 +10:00
60fd027ec3
Fix: New translations django.po from Crowdin
2021-06-09 10:22:53 +10:00
5f85300993
Fix: New translations django.po from Crowdin
2021-06-09 10:22:52 +10:00
e7f3709502
Fix: New translations django.po from Crowdin
2021-06-09 10:22:51 +10:00
60592ef850
updated translation base
2021-06-09 00:04:05 +00:00
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
9fd212d1b2
BuildItemSerializer: Handle errors when thumbnail is not found
2021-06-09 09:41:27 +10:00
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
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
3aadf94a9c
Stock Test: Fix display of stock test table
...
- Incorrect parent node was set
2021-06-08 16:15:40 +10:00
matmair
74c4c559e4
clearer wording for internal price settings
2021-06-07 05:33:20 +02:00
matmair
4f3bfe569a
added in internal prices in price calculations
2021-06-07 05:25:13 +02:00
matmair
0e8a97acb0
added permissions
2021-06-07 05:23:13 +02:00
matmair
37c0025399
settings for internal prices added
2021-06-07 04:58:37 +02:00
matmair
62638f76ed
fixing wrong page title
2021-06-07 04:00:12 +02:00
matmair
6ae9fa716c
added internal price to part_pricing
2021-06-07 00:19:37 +02:00
matmair
27282c8049
Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price
2021-06-06 18:15:41 +02:00
matmair
413fa2e842
merging in sidebar icon changes fr upstream
2021-06-06 17:50:13 +02:00
matmair
5a869d247f
Merge branch 'master' of https://github.com/inventree/InvenTree into part-import
2021-06-06 17:46:33 +02:00
matmair
d70b4bcabb
refactor
2021-06-06 17:44:02 +02:00
matmair
4f7edac213
back button
2021-06-06 17:43:16 +02:00
matmair
a535f8df42
hide scrollbar if not needed
2021-06-06 16:40:51 +02:00
63cbcde4c1
Fix: New translations django.po from Crowdin
2021-06-07 00:38:35 +10:00
e861a0e417
Fix: New translations django.po from Crowdin
2021-06-07 00:38:34 +10:00
b0522ee439
Fix: New translations django.po from Crowdin
2021-06-07 00:38:32 +10:00
ac906ce608
Fix: New translations django.po from Crowdin
2021-06-07 00:38:31 +10:00
d4f30d4f4c
Fix: New translations django.po from Crowdin
2021-06-07 00:38:30 +10:00
5e98d912c2
Fix: New translations django.po from Crowdin
2021-06-07 00:38:29 +10:00
7206930e20
Fix: New translations django.po from Crowdin
2021-06-07 00:38:28 +10:00
989d40eafd
Fix: New translations django.po from Crowdin
2021-06-07 00:38:26 +10:00
c02ed78eb5
Fix: New translations django.po from Crowdin
2021-06-07 00:38:25 +10:00
matmair
a2a2c61e31
refactor and fix rendering on error
2021-06-06 16:36:01 +02:00
matmair
7439f72ab1
hide error messagre on error
2021-06-06 16:33:19 +02:00
matmair
5e6919f14e
hide error message
2021-06-06 16:32:46 +02:00
d756289efe
updated translation base
2021-06-06 14:31:22 +00:00
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
Nigel
Oliver
github-actions[bot]
dependabot[bot]
matmair