inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-20 12:10:09 +00:00
Code Activity
5,706 Commits 8 Branches 168 Tags
3aadf94a9cecce0b86653e9dda0a08c4e906ece9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Oliver Walters b31796cbeb Simplified "installed_in" table 2021-06-01 16:40:02 +10:00
Oliver Walters ee9df039cb allocatedItems function now takes variants into account 2021-06-01 16:19:24 +10:00
Oliver Walters 9baf856d75 Fixes for build item allocation rendering 2021-06-01 16:14:26 +10:00
Oliver Walters ab16e1efc3 Custom migration to find BomItem / BuildItem links where they exist 2021-06-01 15:39:21 +10:00
Oliver Walters 7578cab9a8 Add 'bom_item' field to BuildItem model 
- Required to link the build to the output in case of variant stock
 2021-06-01 15:25:39 +10:00
Oliver Walters 9f407df15a Update BOM table display 2021-06-01 14:17:31 +10:00
Oliver Walters 0bd0e57f16 BomList can be filtered by "allow_variants" flag 2021-06-01 14:03:21 +10:00
Oliver Walters 5c71f04360 Add "allow_variants" field to BomItem 2021-06-01 13:59:01 +10:00
Oliver bd83888717 Fix: New translations django.po from Crowdin 2021-06-01 10:20:41 +10:00
Oliver beae6c55e8 Fix: New translations django.po from Crowdin 2021-06-01 09:15:10 +10:00
Oliver f0354a90fe Fix: New translations django.po from Crowdin 2021-06-01 09:15:09 +10:00
Oliver cc2192aed5 Fix: New translations django.po from Crowdin 2021-06-01 09:15:08 +10:00
Oliver 96f6152f91 Fix: New translations django.po from Crowdin 2021-06-01 09:15:06 +10:00
Oliver 9ceb6353c8 Fix: New translations django.po from Crowdin 2021-06-01 09:15:05 +10:00
Oliver 49abacdc86 Fix: New translations django.po from Crowdin 2021-06-01 09:15:04 +10:00
Oliver 9dceba77bc Fix: New translations django.po from Crowdin 2021-06-01 09:15:03 +10:00
Oliver 416e69bdc5 Fix: New translations django.po from Crowdin 2021-06-01 09:15:02 +10:00
Oliver c2fb582a4e Fix: New translations django.po from Crowdin 2021-06-01 09:15:00 +10:00
Oliver 96624d1175 Merge pull request #1625 from SchrodingersGat/parent-node-fixes 
Specify a unique parent node that cannot shadow an existing pk
 2021-06-01 08:48:57 +10:00
Oliver Walters 0375d5b940 Specify a unique parent node that cannot shadow an existing pk 2021-06-01 08:30:50 +10:00
Oliver ba1d283e64 Fix: New translations django.po from Crowdin 2021-06-01 08:16:19 +10:00
Oliver 76059a4694 Fix: New translations django.po from Crowdin 2021-05-31 17:32:26 +10:00
Oliver 4e4bcd5b65 Fix: New translations django.po from Crowdin 2021-05-31 17:32:25 +10:00
Oliver a97a6ba386 Fix: New translations django.po from Crowdin 2021-05-31 17:32:24 +10:00
Oliver 65321cf9d1 Fix: New translations django.po from Crowdin 2021-05-31 17:32:22 +10:00
Oliver 049f546987 Fix: New translations django.po from Crowdin 2021-05-31 17:32:21 +10:00
Oliver 195f703e69 Fix: New translations django.po from Crowdin 2021-05-31 17:32:20 +10:00
Oliver 5e2f9eebba Fix: New translations django.po from Crowdin 2021-05-31 17:32:19 +10:00
Oliver ca301ea4c0 Fix: New translations django.po from Crowdin 2021-05-31 17:32:17 +10:00
Oliver aa13376a71 Fix: New translations django.po from Crowdin 2021-05-31 17:32:16 +10:00
Oliver a56d7836d0 Merge pull request #1624 from SchrodingersGat/bootstrap-table-fixes 
Bootstrap table fixes
 2021-05-31 17:24:05 +10:00
Oliver Walters 3ba7b2d136 Visual hack for custom part card view 2021-05-31 17:05:12 +10:00
Oliver Walters f0cf83a0b8 Use tree-grid instead of group-by for showing test results 
- Much more predictable display
 2021-05-31 16:55:21 +10:00
Oliver Walters b10410ca1f Update bootstrap-table library 
Updated javascript / css to latest version
 2021-05-31 12:47:07 +10:00
Oliver 5f11f371dc Fix: New translations django.po from Crowdin 2021-05-31 03:23:34 +10:00
Oliver 0dc77ddfca Fix: New translations django.po from Crowdin 2021-05-31 02:18:49 +10:00
Oliver bd28face28 Fix: New translations django.po from Crowdin 2021-05-30 23:19:27 +10:00
Oliver f0e913d200 Fix: New translations django.po from Crowdin 2021-05-30 22:14:06 +10:00
Oliver 0d9d8cf773 Fix: New translations django.po from Crowdin 2021-05-30 07:53:06 +10:00
Oliver a7e8580a36 Fix: New translations django.po from Crowdin 2021-05-30 07:53:04 +10:00
Oliver 51aea69c25 Fix: New translations django.po from Crowdin 2021-05-30 07:53:03 +10:00
Oliver 2620613702 Fix: New translations django.po from Crowdin 2021-05-30 07:53:02 +10:00
Oliver 29edd11323 Fix: New translations django.po from Crowdin 2021-05-30 07:53:00 +10:00
Oliver 4b04502f59 Fix: New translations django.po from Crowdin 2021-05-30 07:52:59 +10:00
Oliver a9ece5f6f2 Fix: New translations django.po from Crowdin 2021-05-30 07:52:58 +10:00
Oliver 0362ce76b4 Fix: New translations django.po from Crowdin 2021-05-30 07:52:57 +10:00
Oliver 4bffd36da1 Fix: New translations django.po from Crowdin 2021-05-30 07:52:54 +10:00
Oliver c08ad467be Merge pull request #1622 from SchrodingersGat/grid-view 
Grid view
 2021-05-30 07:50:32 +10:00
Oliver Walters f1ca17286f Save grid / list selection to local storage settings 2021-05-30 00:38:59 +10:00
Oliver Walters e846c744f4 Buttons to toggle between list and grid views 2021-05-30 00:23:05 +10:00
Oliver Walters ee95cf5c21 Clicking on thumbnail shows modal image 2021-05-30 00:10:46 +10:00
Oliver Walters 887adf35f4 Add simple tile grid view for part list 2021-05-29 23:59:27 +10:00
Oliver Walters 8450029c68 Add custom-view plugin for bootstrap-table 2021-05-29 23:59:07 +10:00
Oliver 1da283d8cc Fix: New translations django.po from Crowdin 2021-05-29 19:33:55 +10:00
Oliver 5b5b4e4bf5 Fix: New translations django.po from Crowdin 2021-05-29 19:33:53 +10:00
Oliver a7070713bc Fix: New translations django.po from Crowdin 2021-05-29 19:33:52 +10:00
Oliver eb96bbb7fd Fix: New translations django.po from Crowdin 2021-05-29 19:33:51 +10:00
Oliver f180c99a96 Fix: New translations django.po from Crowdin 2021-05-29 19:33:50 +10:00
Oliver 9b1100918c Fix: New translations django.po from Crowdin 2021-05-29 19:33:48 +10:00
Oliver 68bbdd8193 Fix: New translations django.po from Crowdin 2021-05-29 19:33:47 +10:00
Oliver 6a84ff55da Fix: New translations django.po from Crowdin 2021-05-29 19:33:46 +10:00
Oliver c967f9c03f Fix: New translations django.po from Crowdin 2021-05-29 19:33:45 +10:00
Oliver dff367b0b0 Update version.py 2021-05-29 19:05:41 +10:00
Oliver 4aa75c25c2 Merge pull request #1620 from SchrodingersGat/template-fix 
Fix part page heading
 2021-05-29 19:05:26 +10:00
Oliver Walters f08c83d6e5 Fix part page heading 2021-05-29 18:48:18 +10:00
Oliver 52ab8b8064 Update docker_publish.yaml 
Add $
 2021-05-29 18:28:07 +10:00
Oliver b94c0b6d9b Merge pull request #1619 from SchrodingersGat/docker-publish 
Tag with release tag
 2021-05-29 18:24:57 +10:00
Oliver Walters 8d33dc5795 Tag with release tag 2021-05-29 17:48:40 +10:00
Oliver 878e9c1e8a Update version.py 
Bump to v2.2
 2021-05-29 17:35:05 +10:00
Oliver 50189afc2e New Crowdin updates (#1618) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-05-29 17:33:52 +10:00