inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 19:52:59 +00:00
Code Activity
9,656 Commits 7 Branches 165 Tags
f31b8a6e99c82daf3e8fceef52a35835601f2016
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub f31b8a6e99 Merge pull request #2179 from SchrodingersGat/settings-page-candy 
Settings page candy
 2021-10-19 12:17:32 +11:00
Oliver 60771a74a4 "InvenTree Settings" > "Global Settings" 2021-10-19 11:00:32 +11:00
Oliver a3b3bdc88b Add some more icons to the settings page 2021-10-19 10:59:52 +11:00
OliverandGitHub 049f5c7fe1 Merge pull request #2178 from SchrodingersGat/home-page-improvements 
UI tweaks
 2021-10-19 09:08:45 +11:00
Oliver 4de3bed342 UI tweaks 2021-10-18 22:19:54 +11:00
OliverandGitHub 860cf46cb0 Merge pull request #2177 from SchrodingersGat/quick-search 
Add a per-user setting to enable display of stock in search results
 2021-10-18 16:57:34 +11:00
Oliver 5802a27fe7 Add a per-user setting to enable display of stock in search results 2021-10-18 16:23:42 +11:00
OliverandGitHub ddeab64072 Merge pull request #2176 from SchrodingersGat/quick-search 
Display stock level in quick search bar
 2021-10-18 16:13:48 +11:00
Oliver 4bb0b725da JS cleanup 2021-10-18 15:51:50 +11:00
Oliver ce921a6774 Display stock level in quick search bar 2021-10-18 15:40:00 +11:00
OliverandGitHub 03726911e1 Merge pull request #2175 from SchrodingersGat/grid-view 
Improvements to "grid view" for parts list
 2021-10-18 13:00:28 +11:00
Oliver 4b344cd7bb CSS tweaks 2021-10-18 12:36:42 +11:00
Oliver 68cfd8615e Improvements to "grid view" for parts list 
- Display 5 tiles per line
- Reduce padding
- Add border
 2021-10-18 12:19:16 +11:00
OliverandGitHub addb265984 Merge pull request #2159 from SchrodingersGat/build-output-complete 
Build output improvements
 2021-10-18 09:16:21 +11:00
Oliver e04dfa0681 Unit test fix 2021-10-18 08:58:04 +11:00
Oliver fb6f15f462 Delete a bunch of old template files 2021-10-17 22:57:15 +11:00
Oliver 83faaa2da3 unit test fixes 2021-10-17 22:57:07 +11:00
Oliver 6ebb956c8d Fix generation of API documentation 
- Can't use get_object_or_404 in API views!
 2021-10-17 22:32:03 +11:00
Oliver 7c5c1b6696 typo fix 2021-10-17 21:55:33 +11:00
Oliver 02f4f0fd15 js linting fixes 2021-10-17 21:50:18 +11:00
Oliver a97a918860 cut out the fat 
(removing dead code for outdated form views)
 2021-10-17 21:46:33 +11:00
Oliver 4a6c1e850f Cleanup unused form 2021-10-17 21:40:59 +11:00
Oliver 90593a187c PEP fixes 2021-10-17 21:39:07 +11:00
Oliver 542b4113a1 Improvements for build output completion 
- Check if the output is fully allocated (throw error if not)
- Reload tables after actions performed
 2021-10-17 21:37:10 +11:00
Oliver bd7fef720d Enable "allocate" button only once the sub-table is expanded 2021-10-17 21:13:07 +11:00
Oliver 87dcaba0d8 Bump API version 2021-10-17 20:23:39 +11:00
Oliver 90625af39d Re-enable the "allocate" stock button 2021-10-17 11:34:44 +11:00
Oliver 6c1dad8d91 Consolidate javascript for sidenavs 2021-10-17 11:26:08 +11:00
Oliver 9d2273c1cd Further work on build output scripts 2021-10-17 11:25:53 +11:00
Oliver 283bf1682f Remove old views / forms 2021-10-17 11:25:33 +11:00
Oliver 14ef56785e Add option to select multiple build outputs 
- Can "complete" these outputs
 2021-10-16 14:27:02 +11:00
Oliver d47b32e4aa Adds function to complete multiple build outputs via the API 2021-10-16 14:08:53 +11:00
Oliver ccaa7d2683 Merge branch 'master' into build-output-complete 2021-10-16 13:18:35 +11:00
Oliver b60296e494 Add some more unit tests 2021-10-16 13:16:19 +11:00
Oliver 41e59e5311 Right align expand buttons 2021-10-16 13:01:19 +11:00
OliverandGitHub 1695eb98ea Merge pull request #2173 from matmair/fix-provider-signup 
fix signup with providers with extra args
 2021-10-16 12:35:22 +11:00
OliverandGitHub b54a948e73 Merge pull request #2168 from SchrodingersGat/db-options-cleanup 
Add support for backend-specific database functionality
 2021-10-15 15:33:52 +11:00
Oliver 603f7d5f45 Fixes 2021-10-15 15:13:06 +11:00
Oliver 6343445433 Add support for backend-specific database functionality 2021-10-15 15:05:55 +11:00
OliverandGitHub 744befcc96 Merge pull request #2161 from matmair/onboarding-group 
Onboarding group
 2021-10-15 12:55:55 +11:00
OliverandGitHub 1c9d759a73 Merge pull request #2167 from SchrodingersGat/spelling-fix 
Standardize spelling of email / e-mail
 2021-10-15 12:48:55 +11:00
Oliver 8e4deaa8c8 Standardize spelling of email / e-mail 
(Spoiler: I chose "email")
 2021-10-15 11:52:13 +11:00
OliverandGitHub a3ef64ef12 Merge pull request #2163 from nwns/feature/sortdeps 
Sort requirements.txt
 2021-10-15 10:44:46 +11:00
OliverandGitHub 074b21bc93 Merge pull request #2162 from matmair/fix-email-settingins 
Fix email settingins
 2021-10-15 07:07:19 +11:00
Oliver 4702c6b37f Refactorin' 2021-10-15 00:25:36 +11:00
Oliver 0d49513092 Add button callbacks for top-level table 2021-10-14 23:58:03 +11:00
Oliver bf47b57c82 working on updating build output tables 2021-10-14 23:46:21 +11:00
Oliver be6f417dff Random button cleanup 2021-10-14 23:13:12 +11:00
Oliver b0a3280c05 Add unit testing 2021-10-14 23:13:08 +11:00
Oliver 54dd05a24d Add an API serializer to complete build outputs 2021-10-14 23:13:01 +11:00
OliverandGitHub 0e589533e5 Merge pull request #2155 from SchrodingersGat/natural-sort 
Natural sort
 2021-10-14 19:32:02 +11:00
Oliver 2c9bbb051a Add some unit tests 
- Saving a model automatically updates the reference_int field
- Data migrations are correctly applied
 2021-10-14 19:12:23 +11:00
Oliver d0f60766e0 exclude new field from admin view 2021-10-14 18:57:02 +11:00
OliverandGitHub ee7b8dc1ad Merge pull request #2158 from SchrodingersGat/part-exclude 
Exclude parts from API
 2021-10-14 18:54:25 +11:00
Oliver 4327cbedce Remove debug message 2021-10-14 18:01:16 +11:00
Oliver d3d1d2f577 Auto-rebuild the reference field for the SalesOrder on save 2021-10-14 18:00:17 +11:00
Oliver 068b54f666 Data migration for PurchaseOrder and SalesOrder models 2021-10-14 17:58:09 +11:00
Oliver 5c6a7b489c Data migration for the Build model 2021-10-14 17:54:46 +11:00
Oliver 7ce0f817aa Add a 'reference_int' field to the models, to be used as a secondary index 2021-10-14 17:45:43 +11:00
Oliver 9b00ede61a Add part queryset filtering to exclude particular ID values 2021-10-14 17:12:08 +11:00
Oliver 0c60387626 Extract a list of existing substitute parts from the form 2021-10-14 16:50:56 +11:00
OliverandGitHub 4b4bf38ae5 Merge pull request #2157 from SchrodingersGat/stock-display-fix 
quick bug fix
 2021-10-14 16:42:44 +11:00
Oliver 9319113793 quick bug fix 2021-10-14 16:27:10 +11:00
OliverandGitHub 05791a8efd Merge pull request #2138 from rocheparadox/master 
Custom name format for parts - FR InvenTree#2085
 2021-10-14 16:03:58 +11:00
Oliver e46875b0a3 Apply same fix to PurchaseOrder and SalesOrder lists 2021-10-14 14:31:25 +11:00
Oliver 233672d822 Add new functionality to InvenTreeOrderingFilter 
- Allow ordering by multiple field aliases
- Simply way to implement "integer ordering" functionality
 2021-10-14 14:25:39 +11:00
Oliver 0cdc82a4b3 Annotate BuildList queryset with integer cast of the reference 2021-10-14 14:24:17 +11:00
OliverandGitHub aa7eb3a6d0 Merge pull request #2154 from SchrodingersGat/filter-bug-fix 
Fix table filtering bug
 2021-10-14 13:23:00 +11:00
Oliver 44b4061d7d Fix table filtering bug 
- Introduced in recent "BOM substitutes" PR
 2021-10-14 11:56:26 +11:00
OliverandGitHub 22572c6f35 Merge pull request #2150 from SchrodingersGat/bom-substitutes 
Bom substitutes
 2021-10-14 11:24:46 +11:00
Oliver 4a6bd0123a Bug fixes 2021-10-14 11:00:27 +11:00
OliverandGitHub 2839c9f0eb Update README.md 
Adds badge for docker build
 2021-10-14 10:34:57 +11:00
Oliver 7dfffcd5d3 Move "build unallocate" functionality to the API 
- Much much simpler now!
- Filtering is against bom_item, not part
- Fixes a bug with the new (reasonably complex) substitution framework
 2021-10-14 10:32:43 +11:00
OliverandGitHub 6012407e93 Merge pull request #2153 from SchrodingersGat/cryptography-version 
Tag specific version of cryptography
 2021-10-14 09:46:48 +11:00
Oliver 7d88cbe27e Tag specific version of cryptography 2021-10-14 09:25:00 +11:00
Oliver 1cbce5dfbf javascript fixes 2021-10-14 09:14:31 +11:00
Oliver 0581885ad5 Simplify BOM table buttons 2021-10-14 00:26:34 +11:00
OliverandGitHub 936104956e Merge pull request #2151 from SchrodingersGat/locale-fix 
Remove locale_stats file
 2021-10-14 00:20:32 +11:00
Oliver c32b17aa4a Remove locale_stats file 2021-10-13 23:58:19 +11:00
Oliver 890741ef5d Display badge indicating variant stock can be used 2021-10-13 23:57:50 +11:00
Oliver be5c5496b2 Improvements to allocation of stock items against build orders 
- Refactor functions for filtering stock using bom_item pk
- Allow selection of substitute items when allocating against build order
- Improvements for modal rendering
- Don't display filter drop-down if there are no filters available
 2021-10-13 23:53:35 +11:00
Oliver c7cec13076 Bug fix 2021-10-13 23:18:44 +11:00
Oliver f3074e8f34 Improved unit testing for BomItem 
- tests for allowing variant parts
- tests for allowing substitutes
 2021-10-13 23:18:26 +11:00
Oliver 0f8c279aa2 Add some unit testing for the new model 2021-10-13 22:27:10 +11:00
Oliver 8512c2db75 Reload the parent table when adding or removing substitutes 2021-10-13 22:06:51 +11:00
Oliver ea4c4c514f Add uniqueness checking for the BomItemSubstitute model 2021-10-13 22:01:32 +11:00
Oliver 0e1e8226b1 Add a callback to remove individual rows 2021-10-13 21:42:50 +11:00
Oliver 8b41e68e6b Launch a dialog displaying the available BOM substitutes 2021-10-13 21:33:41 +11:00
Oliver 6803f3cf63 Display "substitutes available" icon 2021-10-13 20:36:31 +11:00
Oliver 6816071388 Simplify BOM editing view 
- A user with permission to edit BOM data can immediately access the BOM editing tools
 2021-10-13 14:44:59 +11:00
Oliver 51efd6b2e4 Add permissions for new mdoel 2021-10-13 14:06:36 +11:00
Oliver 37bd5c0507 Add serializer and API endpoint for BomItemSubstitute class 2021-10-13 13:58:41 +11:00
Oliver f3f41730be Add "substitutes" column to BOM table 2021-10-13 11:58:40 +11:00
Oliver 324ccd805d Include BomItem substitutes in the serializer 2021-10-13 11:07:44 +11:00
Oliver 7c396f9f39 Enable optional pagination for the BomItem API endpoint 2021-10-13 11:07:34 +11:00
Oliver a00dc9b0b1 Add migration file for new database model 2021-10-13 10:50:24 +11:00
Oliver e20ddc289e Merge branch 'master' into bom-substitutes 2021-10-13 10:15:03 +11:00
OliverandGitHub 384d268534 Merge pull request #2145 from SchrodingersGat/revert-1fb76b9 
Revert 1fb76b9
 2021-10-13 09:55:21 +11:00
Oliver 4f985ae225 Revert 1fb76b9 
Removes global functions to enable / disable entire sections of functionality
 2021-10-13 09:40:17 +11:00
OliverandGitHub 77324c496c Merge pull request #2144 from SchrodingersGat/docker-fix 
Updates for building cryptography lib
 2021-10-13 01:13:29 +11:00