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
2,755 Commits 9 Branches 164 Tags
cedf9a91085af9648f51881c8e579641b3a1973c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters cedf9a9108 Attachment comment field is optional 2020-05-13 10:16:26 +10:00
OliverandGitHub a0e1645ca1 Update README.md 2020-05-12 22:13:50 +10:00
OliverandGitHub c26d22e599 Merge pull request #802 from SchrodingersGat/attachment-user 
Attachment Improvements
 2020-05-12 22:10:44 +10:00
Oliver Walters f5b97da5d2 Refactor "attachment" table into template 2020-05-12 22:05:38 +10:00
Oliver Walters 366d4b2143 Add new attechment functionality to new models 
- Giving the ol' refactor tractor a fresh coat of paint
 2020-05-12 21:40:42 +10:00
Oliver Walters 2369b40bbf Ensure user gets saved when uploading attachment via API 2020-05-12 21:11:38 +10:00
Oliver Walters 5d716d0cdd Add "upload date" field to fileattachment base class 2020-05-12 20:57:41 +10:00
Oliver Walters d4fa7d936e Add 'user' field to attachment 2020-05-12 20:50:03 +10:00
OliverandGitHub 2948dad831 Merge pull request #800 from SchrodingersGat/stock-api 
Stock api
 2020-05-12 20:26:30 +10:00
Oliver Walters 0851a925fb Add ability to filter by whether the part is serialized or not 2020-05-12 20:18:28 +10:00
Oliver Walters 4615fbc0d8 Abillty to filter stock list by serial number 2020-05-12 20:15:37 +10:00
OliverandGitHub c371a9a8e8 Merge pull request #799 from SchrodingersGat/stock-track-api 
Stock track api
 2020-05-12 08:49:18 +10:00
Oliver Walters b9d0c60189 Pepper 2020-05-12 08:12:42 +10:00
Oliver Walters c6cff1fb2e Fixes for StockItem tracking API 
- Make the tracking API consistent with other API endpoints
 2020-05-12 08:12:12 +10:00
OliverandGitHub 18fbe2d2dd Merge pull request #798 from SchrodingersGat/transa 
Typo fix
 2020-05-12 07:11:20 +10:00
Oliver Walters ac5e26ca0e Typo fix 2020-05-12 07:07:29 +10:00
OliverandGitHub d2a7961895 Merge pull request #795 from SchrodingersGat/attachment-api 
Attachment api
 2020-05-12 00:10:13 +10:00
OliverandGitHub 65fe6bfaca Merge pull request #796 from SchrodingersGat/newer-icon 
Newer icon
 2020-05-12 00:09:42 +10:00
Oliver Walters 3151612962 PEP fix 2020-05-12 00:07:08 +10:00
Oliver Walters 693af04c11 Export large version of the logo 2020-05-12 00:06:26 +10:00
Oliver Walters 4b1d96faad Icon tweaks 2020-05-12 00:01:56 +10:00
Oliver Walters 645e5b6449 Add "larger" version of the icon 2020-05-11 23:58:35 +10:00
Oliver Walters 99af98c5a7 Update iconset 2020-05-11 23:58:27 +10:00
Oliver Walters cfc0145180 Add some unit tests 2020-05-11 23:44:22 +10:00
Oliver Walters a7e5a79f4c Expose salesorder and purchaseorder attachments to the API 2020-05-11 23:41:57 +10:00
Oliver Walters 17d0a015f2 Add API endpoint for StockItem attachment items 2020-05-11 23:32:40 +10:00
Oliver Walters f36c5137dd Add ability to add part file attachments via the API 2020-05-11 23:25:55 +10:00
OliverandGitHub f71bfb5700 Update version.py 2020-05-07 10:08:37 +10:00
OliverandGitHub 00ccfdf11b Update version.py 2020-05-07 10:08:20 +10:00
OliverandGitHub 5747a07f7b Merge pull request #792 from SchrodingersGat/stock-item-attachment 
Stock item attachment
 2020-05-07 10:07:31 +10:00
Oliver Walters 003b384abd Slight adjustment to page tabs for StockItem view 2020-05-07 10:04:16 +10:00
Oliver Walters ea0d32fd3d PEP fixes 2020-05-07 09:58:29 +10:00
Oliver Walters 14132a6efa Add views / models / etc etc to support StockItem attachment 2020-05-07 09:57:54 +10:00
Oliver Walters 64f6238351 Add StockItemAttachment model 2020-05-07 09:39:28 +10:00
OliverandGitHub e83a0610af Merge pull request #790 from SchrodingersGat/secondary-dialog 
Add "new manufacturer" button
 2020-05-04 20:05:10 +10:00
Oliver Walters 6318b0bddf Hide a silly button which does nothing 2020-05-04 19:51:06 +10:00
Oliver Walters 0933cf859c Add "new manufacturer" button 2020-05-04 19:48:09 +10:00
OliverandGitHub 7afb2a6a75 Merge pull request #786 from SchrodingersGat/stats-fix 
Table colspan fix
 2020-05-04 10:01:05 +10:00
Oliver Walters ec3e02af94 Table colspan fix 2020-05-04 09:52:50 +10:00
OliverandGitHub 9823c3c81b Merge pull request #785 from SchrodingersGat/bug-icon 
Update icon
 2020-05-04 09:46:19 +10:00
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