inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
2,715 Commits 9 Branches 164 Tags
ce610490b67427449843d2f11aa0d19ec1e61a06
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters ce610490b6 Update icon 
- Simple test to see if the travis integration is working correctly now
 2020-05-04 09:43:09 +10:00
OliverandGitHub 78cc3a9cf3 Merge pull request #783 from SchrodingersGat/redirect-tweaks 
Redirect tweaks
 2020-05-04 08:58:35 +10:00
Oliver Walters 436fb3bf30 PEP fixes 2020-05-04 08:54:16 +10:00
Oliver Walters 2c44104c9c Small tweak for login redirect 2020-05-04 08:53:47 +10:00
OliverandGitHub 461d694cf8 Merge pull request #782 from andyseracuse/redirect-after-login 
after a login redirect and a successful login, the user is now redirected to the originally desired url
 2020-05-04 08:49:13 +10:00
OliverandGitHub 779c1e1d58 Merge pull request #780 from SchrodingersGat/rejected-stock 
Rejected stock
 2020-05-04 08:41:34 +10:00
Oliver Walters 5a100962fe Merge remote-tracking branch 'inventree/master' into rejected-stock 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-05-04 08:10:14 +10:00
OliverandGitHub c505080527 Merge pull request #781 from chschlue/updloc2 
Update de translation
 2020-05-04 08:07:37 +10:00
Oliver Walters 53149ab4dc Merge remote-tracking branch 'inventree/master' into rejected-stock 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-05-04 08:06:50 +10:00
Oliver Walters 54c903f637 translation updates 2020-05-03 09:51:59 +10:00
Oliver Walters 7430abc237 Add ability to set stock status when receiving goods 2020-05-03 09:50:00 +10:00
Oliver Walters fe87bba577 Link fix for purchase order table 2020-05-03 09:46:42 +10:00
OliverandGitHub ca1b9e6403 Merge pull request #778 from SchrodingersGat/dynamic-js 
Update translations
 2020-05-03 09:29:34 +10:00
Oliver Walters 29335fa665 Add "rejected" status code for StockItem 2020-05-03 09:09:17 +10:00
OliverandGitHub 45fc8ce6bd Merge pull request #779 from SchrodingersGat/translation-helper 
Translation helper
 2020-05-03 09:03:06 +10:00
Oliver Walters 275cd063e1 PEP fixes 2020-05-03 08:59:44 +10:00
Oliver Walters 88e28edba9 Script now manually adjusts the translation file 2020-05-02 23:10:18 +10:00
Oliver Walters 979cf10c66 First pass at a translation helper script 2020-05-02 22:52:32 +10:00
Oliver Walters 034f70c491 Update translations 2020-05-02 22:39:56 +10:00
OliverandGitHub 9ee9664e65 Merge pull request #777 from SchrodingersGat/dynamic-js 
Fix stock thing
 2020-05-02 22:22:28 +10:00
Oliver Walters d59f22febb Fix stock thing 2020-05-02 22:18:08 +10:00
OliverandGitHub 1a4f5cf719 Merge pull request #776 from SchrodingersGat/dynamic-js 
Add endpoint for dynamic javascript files
 2020-05-02 22:16:35 +10:00
Oliver Walters af6dd83f05 Rename .js files to .html 
This is required so they are parsed by the translation engine
 2020-05-02 22:13:14 +10:00
Oliver Walters 314b8fdbff regenerate translation files 2020-05-02 22:08:25 +10:00
Oliver Walters 853ba825c0 Translation layer for bom.js 2020-05-02 22:07:24 +10:00
Oliver Walters 6c3dc2a25d Translation layer for company.js 2020-05-02 22:01:40 +10:00
Oliver Walters 2c9b76575e Add translation layer for order.js 2020-05-02 21:55:09 +10:00
Oliver Walters 23bd9afaf8 Add translation layer for build.js 2020-05-02 21:48:28 +10:00
Oliver Walters 24a816e9a2 More translations for part.js and stock.js 2020-05-02 21:43:07 +10:00
Oliver Walters b1a642918c Add translation layer for stock.js 2020-05-02 21:36:18 +10:00
Oliver Walters 9b1e387a8b Translations for part.js 2020-05-02 21:27:45 +10:00
Oliver Walters 5160165669 Add endpoint for dynamic javascript files 2020-05-02 21:19:34 +10:00
OliverandGitHub e998098e4f Merge pull request #775 from SchrodingersGat/sentry-integration 
Add option for sentry.io integration
 2020-05-02 21:04:07 +10:00
Oliver Walters b1d33ef3bc Add option for sentry.io integration 2020-05-02 20:58:29 +10:00
OliverandGitHub 873c03376a Merge pull request #774 from SchrodingersGat/part-display 
Part display
 2020-05-02 20:32:33 +10:00
Oliver Walters b39283a18f Separate allocation counters 2020-05-02 20:29:20 +10:00
Oliver Walters 26f0338f1d Auto-select a purchase order when ordering parts 2020-05-02 20:25:47 +10:00
Oliver Walters 0199760e1c Bug fix 2020-05-02 20:10:12 +10:00
Oliver Walters b89002a450 Add button to order a supplier part 2020-05-02 20:10:00 +10:00
OliverandGitHub 0b2c6cfd70 Merge pull request #773 from SchrodingersGat/moar-speed-fix-plz 
Reduce company list from 100 queries to 4 queries
 2020-05-02 15:41:39 +10:00
Oliver Walters b0f4475a83 Fixes 2020-05-02 15:36:48 +10:00
Oliver Walters a8e3a3f1ac Reduce company list from 100 queries to 4 queries 2020-05-02 15:23:28 +10:00
OliverandGitHub 5f6599a950 Merge pull request #772 from SchrodingersGat/new-logo 
New logo
 2020-05-02 15:19:52 +10:00
Oliver Walters 6aa6e3b924 Adjust icon size in nav bar 2020-05-02 15:03:49 +10:00
Oliver Walters 24a9a1127b Update favicon 
https://www.favicon-generator.org/
 2020-05-02 14:58:07 +10:00
Oliver Walters a51aab6dd0 Update translations 
(cherry picked from commit 032f3337cddf684839586728e47864d22a890024)
 2020-05-02 14:55:31 +10:00
Oliver Walters b44dbba150 New logo design 
(cherry picked from commit b59e26b4629ea97e0ac8b3503cc50c59049d81c1)
 2020-05-02 14:55:27 +10:00
OliverandGitHub d276c48fef Merge pull request #771 from SchrodingersGat/query-speed 
Query speed
 2020-05-02 14:15:05 +10:00
Oliver Walters 9b2045025b StockItem page tweaks 2020-05-02 14:05:52 +10:00
Oliver Walters cc11df917e Part list API adjustments 2020-05-02 14:03:17 +10:00
Oliver Walters 7fca496de8 Bug fix for StockItem list API 
- The wrong detail data was being set
 2020-05-02 13:51:29 +10:00
Oliver Walters 4197e29fce Major major major (improvements for StockItem list API) 
OK LISTEN UP - Lots of work went into making this speedier:

- For related detail fields (e.g. part_detail), we pre-fetch and cache the model data
- This eliminates duplicate database hits for the same model instances
- Perform all field filtering manually, rather than using the DRF 'filter_fields' concept (this seems to add a lot of overhead)
- Use query annotations to getch calculated fields rather than fetching one-at-a-time
- And finally, if the request is AJAX then return a JsonResponse which is SO FREAKING MUCH FASTER
 2020-05-02 13:46:19 +10:00
Oliver Walters 44319d24e4 Custom list serializer for 'location_detail' 2020-05-02 10:05:35 +10:00
Oliver Walters a537b6df6e PEP fixes 2020-05-02 09:50:18 +10:00
Oliver Walters 4a60da67fd Significant increase in query speed for Part list 
- Custom list method
- Cache PartCategory objects in memory
 2020-05-02 09:49:05 +10:00
OliverandGitHub acea0d6e92 Merge pull request #770 from SchrodingersGat/missing-git 
Catch an error if git cannot be found
 2020-05-01 17:08:42 +10:00
Oliver Walters 7fff0a7427 Catch an error if git cannot be found 2020-05-01 17:02:11 +10:00
OliverandGitHub 68bbb372dc Merge pull request #769 from SchrodingersGat/migration-ixes 
Bug fix for custom migration
 2020-05-01 16:23:53 +10:00
Oliver Walters af00d88555 Bug fix for custom migration 
Ref: https://stackoverflow.com/questions/13410982/attributeerror-long-object-has-no-attribute-fetchall#13411358
 2020-05-01 15:57:10 +10:00
OliverandGitHub 86c00f54b7 Merge pull request #767 from SchrodingersGat/fix 
Fix for BOM table display
 2020-04-28 23:31:52 +10:00
Oliver Walters a345e0e8da Removed unused serializer field 2020-04-28 23:26:27 +10:00
Oliver Walters 753fab2498 Fix url links in BOM table 2020-04-28 23:23:59 +10:00
Oliver Walters 3b42b5e27e Typo fix for part api 2020-04-28 23:17:59 +10:00
Oliver Walters 087001f29d Fix BOM table rendering 
- Price was not being sent in the PartBriefSerializer!
 2020-04-28 23:17:15 +10:00
Oliver Walters df218a5193 Fix rendering of "used in" page 2020-04-28 22:57:18 +10:00
OliverandGitHub 24ad4f5332 Merge pull request #765 from SchrodingersGat/markdowner 
DO NOT DRINK BLEACH
 2020-04-28 12:34:21 +10:00
Oliver Walters f84636fc20 DO NOT DRINK BLEACH 2020-04-28 12:29:28 +10:00
OliverandGitHub 2be8aad29c Merge pull request #763 from SchrodingersGat/fixes 
Update buttons for part BOM view
 2020-04-28 10:51:11 +10:00
Oliver Walters ee906fc6e6 Unit test fixes 2020-04-28 10:46:02 +10:00
Oliver Walters 9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters 6bdf371490 Moar UI and translation string fixes 2020-04-28 09:41:47 +10:00
Oliver Walters bbecc8c900 Reverse URL bug fix 2020-04-28 09:35:24 +10:00
Oliver Walters b913971008 Add more translatable strings 2020-04-28 09:32:33 +10:00
Oliver Walters 440fe155ff Change glyphicons for fontawesome 
I think I gottem all
 2020-04-28 09:31:51 +10:00
Oliver Walters abbd0bb16a Bug fix in supplier-part table rendering 2020-04-28 09:05:06 +10:00
Oliver Walters 5727e27ae6 Filter by 'in stock' items when auto-allocating to build 2020-04-28 08:44:10 +10:00
Oliver Walters 4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
OliverandGitHub c621780a2a Merge pull request #748 from SchrodingersGat/sales-order 
Sales order [WIP]
 2020-04-27 22:14:45 +10:00
Oliver Walters 394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2020-04-27 22:04:05 +10:00
Oliver Walters 79836c77ef Bumped version thing 2020-04-27 22:03:15 +10:00
Oliver Walters db9970e5df Add some further unit tests for the Build model 2020-04-27 21:44:59 +10:00
Oliver Walters cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters 35f48ed899 Delete BuildItem objects once a Build has been completed 
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
 2020-04-27 20:46:34 +10:00
Oliver Walters 489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors! 
This one has been here for a while!
 2020-04-27 20:45:01 +10:00
Oliver Walters 2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters 646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters 3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +10:00
Oliver Walters 5e309a62f7 Display "Fulfilled" items 
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
 2020-04-27 10:31:38 +10:00
Oliver Walters 9b882f4d17 Update to latest version of django-qr-code 2020-04-27 09:17:17 +10:00
Oliver Walters 5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped 
- This allows us to delete the SalesOrderAllocation objects from the database
 2020-04-27 08:58:18 +10:00
Oliver Walters 3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters e768ada83b More work 
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
 2020-04-26 16:38:29 +10:00
Oliver Walters 4147163418 Improve status code label rendering 2020-04-26 15:29:21 +10:00
OliverandGitHub 48c51151c8 Merge pull request #756 from SchrodingersGat/moar-migration-fixes-plz 
Remove the problematic migration entirely
 2020-04-26 09:00:23 +10:00
Oliver Walters ae4717401f Add "sudo" to makefile 2020-04-26 08:56:36 +10:00
Oliver Walters 1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +10:00
Oliver Walters 0892b160c6 "Fixes" for completing a build 
- This will require a lot of unit testing to get right
 2020-04-26 00:32:09 +10:00
Oliver Walters 72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters 50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00