inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 12:33:33 +00:00
Code Activity
16,030 Commits 11 Branches 155 Tags
ff81cb61f2530c463581a6c9c31e50e12e8bd258
Commit Graph

16030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
matmair 3fb95bea7e added test for sell price breaks 2021-06-13 13:31:31 +02:00
Oliver 8b6dceb599 Fix: New translations django.po from Crowdin 2021-06-12 08:09:58 +10:00
Oliver 0f30d9961a Fix: New translations django.po from Crowdin 2021-06-12 08:09:57 +10:00
Oliver 8001a1a794 Fix: New translations django.po from Crowdin 2021-06-12 08:09:56 +10:00
Oliver 9e70674700 Fix: New translations django.po from Crowdin 2021-06-12 08:09:54 +10:00
Oliver 0dae3a1057 Fix: New translations django.po from Crowdin 2021-06-12 08:09:53 +10:00
Oliver 08d3058ad7 Fix: New translations django.po from Crowdin 2021-06-12 08:09:52 +10:00
Oliver 3be1f99380 Fix: New translations django.po from Crowdin 2021-06-12 08:09:51 +10:00
Oliver 26c682f016 Fix: New translations django.po from Crowdin 2021-06-12 08:09:50 +10:00
Oliver c519578a21 Fix: New translations django.po from Crowdin 2021-06-12 08:09:49 +10:00
github-actions[bot] e0c5ef3f04 updated translation base 2021-06-11 22:02:48 +00: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
matmair c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
github-actions[bot] 1e10f0e373 updated translation base 2021-06-10 22:16:57 +00: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
github-actions[bot] 9b30dc71b8 updated translation base 2021-06-10 01:07:39 +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 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
Oliver fae90d19d5 Merge remote-tracking branch 'inventree/master' 2021-06-09 16:16:09 +10:00
github-actions[bot] adfbcf6055 updated translation base 2021-06-09 01:56:02 +00:00
Oliver 0076c0cec5 Merge pull request #1649 from SchrodingersGat/typo-fix 
Fix typo in getStockItemThumbnail
 2021-06-09 11:54:50 +10:00
github-actions[bot] bde2902798 updated translation base 2021-06-09 01:48:18 +00: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 cd2fcdd436 Fix: New translations django.po from Crowdin 2021-06-09 10:23:03 +10:00
Oliver 96776fc9fe Fix: New translations django.po from Crowdin 2021-06-09 10:23:02 +10:00
Oliver a1b48428dd Fix: New translations django.po from Crowdin 2021-06-09 10:22:59 +10:00
Oliver 3e9014646f Fix: New translations django.po from Crowdin 2021-06-09 10:22:58 +10:00
Oliver 1a7eebb7ab Fix: New translations django.po from Crowdin 2021-06-09 10:22:56 +10:00
Oliver b8cd0d52d9 Fix: New translations django.po from Crowdin 2021-06-09 10:22:55 +10:00
Oliver 60fd027ec3 Fix: New translations django.po from Crowdin 2021-06-09 10:22:53 +10:00
Oliver 5f85300993 Fix: New translations django.po from Crowdin 2021-06-09 10:22:52 +10:00
Oliver e7f3709502 Fix: New translations django.po from Crowdin 2021-06-09 10:22:51 +10:00
github-actions[bot] 60592ef850 updated translation base 2021-06-09 00:04:05 +00: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
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