Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,767 Commits 6 Branches 99 Tags 484 MiB
2cbdeae914
Commit Graph

5767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Matthias
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
Matthias
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
Matthias
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
Matthias
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
dependabot[bot]
7d7e518c1b
Bump django from 3.2 to 3.2.1 
Bumps [django](https://github.com/django/django) from 3.2 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-04 21:37:26 +00: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
Oliver
f0a1cca914 Fix: New translations django.po from Crowdin 2021-06-03 14:40:53 +10:00
Oliver
4af74a5ba5 Fix: New translations django.po from Crowdin 2021-06-03 09:52:21 +10:00
Oliver
92f77b6bbb
Merge pull request #1627 from eeintech/price_break_sort_fix 
Fixed price break row actions after sorting
 2021-06-03 09:18:49 +10:00
Oliver
2948cf5671 Fix: New translations django.po from Crowdin 2021-06-03 05:11:59 +10:00
Oliver
3b6aba7153 Fix: New translations django.po from Crowdin 2021-06-03 04:12:58 +10:00
Oliver
69ed180034 Fix: New translations django.po from Crowdin 2021-06-03 03:15:00 +10:00
Oliver
7b1bd87d84 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-02 22:58:34 +10:00
Oliver
7df72f09f4 Fix: New translations django.po from Crowdin 2021-06-02 09:57:53 +10:00
Oliver
56afcfa91f Fix: New translations django.po from Crowdin 2021-06-02 08:50:33 +10:00
eeintech
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver
61af4ca1b3 Fix: New translations django.po from Crowdin 2021-06-01 20:22:45 +10:00
Oliver
ddf1f5c5ba Fix: New translations django.po from Crowdin 2021-06-01 20:22:43 +10:00
Oliver
1a3943fd7c Fix: New translations django.po from Crowdin 2021-06-01 20:22:42 +10:00
Oliver
3df5ef5676 Fix: New translations django.po from Crowdin 2021-06-01 20:22:40 +10:00
Oliver
235b2632ed Fix: New translations django.po from Crowdin 2021-06-01 20:22:39 +10:00
Oliver
a4d63ad9b0 Fix: New translations django.po from Crowdin 2021-06-01 20:22:37 +10:00
Oliver
85a0cd84d4 Fix: New translations django.po from Crowdin 2021-06-01 20:22:36 +10:00
Oliver
feb1b47f93 Fix: New translations django.po from Crowdin 2021-06-01 20:22:34 +10:00
Oliver
f9b5f78716 Fix: New translations django.po from Crowdin 2021-06-01 20:22:33 +10:00
github-actions[bot]
60752d2619 updated translation base 2021-06-01 10:08:09 +00:00
Oliver
720184790e
Merge pull request #1626 from SchrodingersGat/bom-allow-variants 
[Feature] Support BOM items which can allow use of variant stock
 2021-06-01 20:07:03 +10:00