inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
8,965 Commits 9 Branches 164 Tags
56221a33bf696e11f894c16c30dcb51c85304a21
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub dfdbb4f7d1 Update version.py 
Bumped version number for dev branch
 2021-10-04 09:35:21 +11:00
OliverandGitHub b7ff50ca87 Merge pull request #2090 from SchrodingersGat/po-api-fix 
Fix for purchase order API
 2021-10-03 01:33:23 +10:00
Oliver 8c78d3b8ea Add unit test 2021-10-03 01:03:40 +10:00
Oliver 6d448d8475 Handle internal django errors when receiving purchase order items via the API 
(cherry picked from commit 9355c68024)
 2021-10-03 00:24:09 +10:00
OliverandGitHub 16dcd8adf6 Merge pull request #2084 from eeintech/show_part_delete 
Show part delete button when part still active
 2021-10-01 08:46:25 +10:00
OliverandGitHub 172d184a4d Merge pull request #2086 from SchrodingersGat/search-fix 
Fix for search page
 2021-09-30 22:13:38 +10:00
Oliver 7e81f419d7 Refactor search results for stock items and locations 2021-09-30 20:23:41 +10:00
Oliver ab9d247531 server-side pagination for manufacturer part table 2021-09-30 20:17:10 +10:00
Oliver e36039b03f Server-side pagination for part category search results 2021-09-30 20:15:54 +10:00
Oliver b9c8e46e1c Fixes for supplierpart table 
- Paginate on server side
 2021-09-30 20:12:27 +10:00
Oliver 15d96a3288 Fix for URL in supplier parts table 2021-09-30 19:50:16 +10:00
Oliver 4ced13466a Use "original_search" rather than "search" 2021-09-30 17:57:19 +10:00
Oliver 6cf144c61f Retain "original" search parameter in query 2021-09-30 17:53:14 +10:00
OliverandGitHub b3422e592d Update README.md 2021-09-30 10:46:22 +10:00
OliverandGitHub 819934af7e Merge pull request #2083 from SchrodingersGat/search-results 
Display "full_name" rather than "name" in quick search bar
 2021-09-30 09:42:50 +10:00
Oliver b1730914c3 Display "full_name" rather than "name" in quick search bar 2021-09-29 22:12:20 +10:00
OliverandGitHub 344383d3d4 Merge pull request #2082 from SchrodingersGat/stock-item-delete 
Override the "delete" behaviour for StockItem API
 2021-09-28 10:57:14 +10:00
Oliver 62e62af5fc PEP style fixes 2021-09-28 10:41:30 +10:00
Oliver d9704f4123 Add unit test for deleting stock items via the API 2021-09-28 10:41:03 +10:00
Oliver 2d9ca7c1b6 Do not rebuild the entire StockItem tree every time a single StockItem is deleted! 2021-09-28 10:36:01 +10:00
Oliver 16e00962f5 Override the "delete" behaviour for StockItem API 
- Mark for deletion instead of calling database delete
- Returns (almost) instantly instead of hanging
- Much better UI experience when performing bulk delete operations
 2021-09-28 10:14:25 +10:00
OliverandGitHub eb48c6ebdb Delete app_issue.md 2021-09-28 09:29:14 +10:00
OliverandGitHub b623f34881 Merge pull request #2079 from SchrodingersGat/url-fix 
URL fixes
 2021-09-27 14:32:41 +10:00
Oliver 26e3dbd9d0 Remove debug message 2021-09-27 11:46:14 +10:00
Oliver ef01bdff07 Fix links in part table 2021-09-27 11:42:47 +10:00
Oliver beaa93f9b5 Fix ?display= URLs for part stock view 2021-09-27 11:41:24 +10:00
OliverandGitHub b3c8bd7779 Merge pull request #2075 from SchrodingersGat/default-supplier-fix 
Default supplier fix
 2021-09-24 12:35:28 +10:00
Oliver f53aac0784 Remove "default_supplier" field when duplicating a part 2021-09-24 12:04:36 +10:00
Oliver d2b9993e96 Fix form filters for "default_supplier" 2021-09-24 12:04:25 +10:00
OliverandGitHub 39cab4690d Merge pull request #2071 from inventree/dependabot/pip/django-3.2.5 
Build(deps): Bump django from 3.2.4 to 3.2.5
 2021-09-23 21:51:23 +10:00
OliverandGitHub 2e1277839e Merge pull request #2067 from SchrodingersGat/warning-improvements 
Improve 'health status' warnings
 2021-09-22 09:34:23 +10:00
OliverandGitHub b123135df6 Merge pull request #2068 from rocheparadox/master 
css for part to occupy full height - fix for bug Inventree#1848
 2021-09-22 09:06:03 +10:00
Oliver 5443beef65 Improve 'health status' warnings 
- Don't show error message if only non-critical warnings present
 2021-09-20 17:15:31 +10:00
OliverandGitHub ae3c9817be Merge pull request #2062 from SchrodingersGat/app-issue-template 
Add template for app issues
 2021-09-17 22:34:45 +10:00
Oliver 8d6d16c07b Add template for app issues 2021-09-17 22:13:13 +10:00
OliverandGitHub 7b2b01c26f Merge pull request #2060 from SchrodingersGat/character-test 
Adds a test for non-standard characters via API
 2021-09-17 21:48:10 +10:00
Oliver e7963f8a85 test fixes 2021-09-17 21:06:07 +10:00
Oliver 11cc0c7ced Adds a test for non-standard characters via API 2021-09-17 20:53:18 +10:00
OliverandGitHub d73a7176fd Merge pull request #2055 from SchrodingersGat/test-template-table-fix 
Fix callback for test template table
 2021-09-14 10:58:57 +10:00
Oliver 5bd5c61b9d Fix callback for test template table 2021-09-14 10:43:40 +10:00
OliverandGitHub 1643a2ccb2 Merge pull request #2054 from matmair/fix-for-2004 
Fix for 2004
 2021-09-14 10:00:19 +10:00
OliverandGitHub 95924852a4 Merge pull request #2053 from SchrodingersGat/contributing 
Update contributing.md
 2021-09-13 20:29:09 +10:00
Oliver dfd500097e Update contributing.md 
(cherry picked from commit 398842d6e5)
 2021-09-13 20:03:31 +10:00
Oliver 7a7684b018 Merge branch 'l10' 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/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/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-13 10:15:08 +10:00
Oliver 6f932551d4 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-13 10:01:45 +10:00
Oliver 0bd37e61ea Fix: New translations django.po from Crowdin 2021-09-12 23:44:36 +10:00
Oliver 1501820760 Fix: New translations django.po from Crowdin 2021-09-12 23:44:35 +10:00
Oliver 0d3f738c79 Fix: New translations django.po from Crowdin 2021-09-12 23:44:33 +10:00
Oliver ad662531d2 Fix: New translations django.po from Crowdin 2021-09-12 23:44:32 +10:00
Oliver 422fa63b10 Fix: New translations django.po from Crowdin 2021-09-12 23:44:31 +10:00
Oliver 9d2f52c203 Fix: New translations django.po from Crowdin 2021-09-12 23:44:30 +10:00
Oliver 4fbc9fa70e Fix: New translations django.po from Crowdin 2021-09-12 23:44:28 +10:00
Oliver ea05883589 Fix: New translations django.po from Crowdin 2021-09-12 23:44:27 +10:00
Oliver dd9a5d218d Fix: New translations django.po from Crowdin 2021-09-12 23:44:26 +10:00
Oliver 93c3a805bf Fix: New translations django.po from Crowdin 2021-09-12 23:44:25 +10:00
Oliver a5e02f37d9 Fix: New translations django.po from Crowdin 2021-09-12 23:44:23 +10:00
Oliver 506af63d65 Fix: New translations django.po from Crowdin 2021-09-12 23:44:22 +10:00
Oliver 820631e2d1 Fix: New translations django.po from Crowdin 2021-09-12 23:44:21 +10:00
Oliver c4e6b8d7d8 Fix: New translations django.po from Crowdin 2021-09-12 23:44:19 +10:00
Oliver d4be8407fb Fix: New translations django.po from Crowdin 2021-09-12 23:44:18 +10:00
Oliver 97e984a4c0 Fix: New translations django.po from Crowdin 2021-09-12 23:44:17 +10:00
Oliver 9615ea2e1b Fix: New translations django.po from Crowdin 2021-09-12 23:44:15 +10:00
Oliver e2dbdbf1a2 Fix: New translations django.po from Crowdin 2021-09-12 23:44:14 +10:00
Oliver Walters 06c03039da Add version related tags 
- Docs URL points to correct documentation version
- Display if we are in "development" version
 2021-09-12 23:13:55 +10:00
OliverandGitHub 695370c8d7 Merge pull request #2048 from inventree/version-tags 
Updates for docker workflows:
 2021-09-12 22:28:26 +10:00
Oliver Walters 7b21270baf Bump version number 2021-09-12 22:08:51 +10:00
Oliver Walters 08397c5e5f different syntax 2021-09-12 22:06:06 +10:00
Oliver Walters 3d4a8bdd22 env prefix 2021-09-12 21:54:59 +10:00
Oliver Walters 06f323fe47 Use GITHUB_BASE_REF 2021-09-12 21:52:02 +10:00
Oliver Walters 6baaf98d7e fix environment variable 2021-09-12 21:49:13 +10:00
Oliver Walters 5770789ddb more fix 2021-09-12 21:40:56 +10:00
Oliver Walters fd192b65bf workflow fix 2021-09-12 21:37:30 +10:00
Oliver Walters 5ee004eabd Add workflow to check version number 2021-09-12 21:36:14 +10:00
Oliver Walters 429add9000 Updates for docker workflows: 
- check_version_number script now handles stable and development codes
 2021-09-12 21:17:56 +10:00
Oliver 0d24f3be8b Fix: New translations django.po from Crowdin 2021-09-11 13:54:59 +10:00
Oliver 45dfeb4614 Fix: New translations django.po from Crowdin 2021-09-11 12:47:26 +10:00
Oliver 4aa829877e Fix: New translations django.po from Crowdin 2021-09-11 11:45:01 +10:00
Oliver 3a82c675c2 Update .gitignore 2021-09-08 15:20:58 +10:00
Oliver 79a0140d71 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-08 15:20:13 +10:00
OliverandGitHub 71ca60d679 Merge pull request #2044 from SchrodingersGat/new-line-item 
Bug fix - "Add line item" button
 2021-09-08 14:32:51 +10:00
Oliver ca7d779116 Fix: New translations django.po from Crowdin 2021-09-08 14:15:50 +10:00
Oliver 8e85203be3 Fix: New translations django.po from Crowdin 2021-09-08 14:15:49 +10:00
Oliver 6cee801659 Fix: New translations django.po from Crowdin 2021-09-08 14:15:47 +10:00
Oliver def20d2923 Fix: New translations django.po from Crowdin 2021-09-08 14:15:45 +10:00
Oliver 821fe81411 Fix: New translations django.po from Crowdin 2021-09-08 14:15:44 +10:00
Oliver aee8ca886f Fix: New translations django.po from Crowdin 2021-09-08 14:15:42 +10:00
Oliver ed0cb33510 Fix: New translations django.po from Crowdin 2021-09-08 14:15:41 +10:00
Oliver fcc8e14a5b Fix: New translations django.po from Crowdin 2021-09-08 14:15:40 +10:00
Oliver e47c7322b8 Fix: New translations django.po from Crowdin 2021-09-08 14:15:39 +10:00
Oliver 4ca40ca83c Fix: New translations django.po from Crowdin 2021-09-08 14:15:37 +10:00
Oliver 4a7e71b0a2 Fix: New translations django.po from Crowdin 2021-09-08 14:15:36 +10:00
Oliver 8121ab32c5 Fix: New translations django.po from Crowdin 2021-09-08 14:15:35 +10:00
Oliver 50f673d25d Fix: New translations django.po from Crowdin 2021-09-08 14:15:34 +10:00
Oliver 79d3ef982a Fix: New translations django.po from Crowdin 2021-09-08 14:15:32 +10:00
Oliver 2fd179bf58 Fix: New translations django.po from Crowdin 2021-09-08 14:15:31 +10:00
Oliver 6adcf60ff8 Fix: New translations django.po from Crowdin 2021-09-08 14:15:29 +10:00
Oliver dfeffff118 Fix: New translations django.po from Crowdin 2021-09-08 14:15:28 +10:00
Oliver 6f3eb77ac9 Fix: New translations django.po from Crowdin 2021-09-08 14:15:27 +10:00
Oliver b9b23a3853 bug fix 2021-09-08 14:14:14 +10:00
OliverandGitHub 829dd0d637 Merge pull request #2043 from SchrodingersGat/received-stock-items 
Fixes for purchase order stock table
 2021-09-08 13:29:05 +10:00