2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 03:25:42 +00:00
Commit Graph

7646 Commits

Author SHA1 Message Date
c1499a7748 Fix: New translations django.po from Crowdin 2021-06-15 07:34:08 +10:00
e2b529743a Fix: New translations django.po from Crowdin 2021-06-15 07:34:07 +10:00
71cf41e7cd Fix: New translations django.po from Crowdin 2021-06-15 07:34:05 +10:00
27a5d6843f Fix: New translations django.po from Crowdin 2021-06-15 07:34:04 +10:00
36a3ed563f Fix: New translations django.po from Crowdin 2021-06-15 07:34:03 +10:00
aa4cfc4c53 updated translation base 2021-06-14 21:21:17 +00:00
8da00c6106 Merge pull request #1662 from eeintech/fix-1661
Add "Purchase Price" to stock table
2021-06-15 07:20:03 +10:00
08fbdf660b Fix for #1661 2021-06-14 14:19:10 -04:00
ed34a85b14 Merge remote-tracking branch 'upstream/master' 2021-06-14 21:49:55 +10:00
a9636b7ec5 updated translation base 2021-06-14 11:41:16 +00:00
8e6691ce36 Merge pull request #1658 from matmair/fix-whitespace-paths
fix whitespaces in paths
2021-06-14 21:39:51 +10:00
ec19d77523 fix whitespaces in paths 2021-06-13 20:08:42 +02:00
f03dfa8131 Fix: New translations django.po from Crowdin 2021-06-14 00:47:23 +10:00
3e11fc3437 Fix: New translations django.po from Crowdin 2021-06-13 23:49:06 +10:00
447a7dd4e4 style fix 2021-06-13 15:04:57 +02:00
3f04a57452 added test for internal prices 2021-06-13 15:01:03 +02:00
3fb95bea7e added test for sell price breaks 2021-06-13 13:31:31 +02:00
8b6dceb599 Fix: New translations django.po from Crowdin 2021-06-12 08:09:58 +10:00
0f30d9961a Fix: New translations django.po from Crowdin 2021-06-12 08:09:57 +10:00
8001a1a794 Fix: New translations django.po from Crowdin 2021-06-12 08:09:56 +10:00
9e70674700 Fix: New translations django.po from Crowdin 2021-06-12 08:09:54 +10:00
0dae3a1057 Fix: New translations django.po from Crowdin 2021-06-12 08:09:53 +10:00
08d3058ad7 Fix: New translations django.po from Crowdin 2021-06-12 08:09:52 +10:00
3be1f99380 Fix: New translations django.po from Crowdin 2021-06-12 08:09:51 +10:00
26c682f016 Fix: New translations django.po from Crowdin 2021-06-12 08:09:50 +10:00
c519578a21 Fix: New translations django.po from Crowdin 2021-06-12 08:09:49 +10:00
e0c5ef3f04 updated translation base 2021-06-11 22:02:48 +00:00
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
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
1e10f0e373 updated translation base 2021-06-10 22:16:57 +00:00
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
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
9b30dc71b8 updated translation base 2021-06-10 01:07:39 +00:00
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
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
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