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
9,597 Commits 9 Branches 164 Tags
55ba9ad6c9da288f864d43a143a934e0ec8e5a32
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 1832a6f1fa Run APK upgrade 
Ref:
 2021-10-13 00:53:41 +11:00
Oliver Walters c3e0c9378f Upgrade pip as part of dockerfile 2021-10-13 00:52:48 +11:00
Oliver Walters ac242c01c1 Updates for building cryptography lib 2021-10-13 00:46:46 +11:00
Oliver Walters 4eb8c60ee0 Add new BomItemSubstitute model 2021-10-12 22:22:49 +11:00
OliverandGitHub 2990dbf512 Merge pull request #2142 from SchrodingersGat/docker-repo-fix 
remove 'repository' arg from docker builds
 2021-10-12 21:49:02 +11:00
Oliver Walters ec24f77da8 remove 'repository' arg from docker builds 2021-10-12 21:29:55 +11:00
OliverandGitHub b9ad6bf9f9 Merge pull request #2137 from SchrodingersGat/nameless-user-fix 
Handle rare case where user instance has no name assigned
 2021-10-12 14:39:53 +11:00
Oliver 75bfdd615e Fixes for unit tests 2021-10-12 11:38:25 +11:00
Oliver 40e5536300 Handle rare case where user instance has no name assigned 2021-10-11 21:39:34 +11:00
Oliver 772d3fa67d Merge remote-tracking branch 'inventree/l10_crowdin' 2021-10-11 21:02:35 +11:00
OliverandGitHub 5b4d646ca3 Merge pull request #2135 from SchrodingersGat/docs-fix-fix 
re-simplify the documentation URL
 2021-10-11 18:54:56 +11:00
Oliver 62ce278fb7 Fix: New translations django.po from Crowdin 2021-10-11 17:29:16 +11:00
Oliver c125cc4b29 Fix: New translations django.po from Crowdin 2021-10-11 17:29:15 +11:00
Oliver e9350ca0e4 Fix: New translations django.po from Crowdin 2021-10-11 17:29:13 +11:00
Oliver 004bb35245 Fix: New translations django.po from Crowdin 2021-10-11 17:29:12 +11:00
Oliver b1f51afac1 Fix: New translations django.po from Crowdin 2021-10-11 17:29:11 +11:00
Oliver f0d2a32990 Fix: New translations django.po from Crowdin 2021-10-11 17:29:09 +11:00
Oliver fe06542498 Fix: New translations django.po from Crowdin 2021-10-11 17:29:08 +11:00
Oliver 20874ca68a Fix: New translations django.po from Crowdin 2021-10-11 17:29:07 +11:00
Oliver e1b0dc3669 Fix: New translations django.po from Crowdin 2021-10-11 17:29:05 +11:00
Oliver b56c0e3a56 Fix: New translations django.po from Crowdin 2021-10-11 17:29:04 +11:00
Oliver 181091ce2d Fix: New translations django.po from Crowdin 2021-10-11 17:29:02 +11:00
Oliver 51e822a1f5 Fix: New translations django.po from Crowdin 2021-10-11 17:29:01 +11:00
Oliver b334b85363 Fix: New translations django.po from Crowdin 2021-10-11 17:28:59 +11:00
Oliver f722c765b3 Fix: New translations django.po from Crowdin 2021-10-11 17:28:58 +11:00
Oliver ce550cfcd0 Fix: New translations django.po from Crowdin 2021-10-11 17:28:57 +11:00
Oliver 0299dda74c Fix: New translations django.po from Crowdin 2021-10-11 17:28:55 +11:00
Oliver 4a701a7a3a Fix: New translations django.po from Crowdin 2021-10-11 17:28:54 +11:00
Oliver 76b0ed3243 Fix: New translations django.po from Crowdin 2021-10-11 17:28:53 +11:00
Oliver 00f8d98094 re-simplify the documentation URL 
- dev version = "latest"
- stable version = "x.y.z"
- Requires an explicit docs version release for every software release
 2021-10-11 17:26:48 +11:00
OliverandGitHub 19a8c712d4 Merge pull request #2017 from matmair/fr-1421-sso 
SSO!
 2021-10-11 17:20:08 +11:00
Oliver d874dc29b1 Fix: New translations django.po from Crowdin 2021-10-11 12:03:48 +11:00
Oliver 20ab5c7cf0 Fix: New translations django.po from Crowdin 2021-10-11 12:03:47 +11:00
Oliver 5d619cbd0e Fix: New translations django.po from Crowdin 2021-10-11 12:03:46 +11:00
Oliver 2755ae1b4c Fix: New translations django.po from Crowdin 2021-10-11 12:03:44 +11:00
Oliver 581a3ffb2a Fix: New translations django.po from Crowdin 2021-10-11 12:03:43 +11:00
Oliver 50a1fa42de Fix: New translations django.po from Crowdin 2021-10-11 12:03:42 +11:00
Oliver 681452db3d Fix: New translations django.po from Crowdin 2021-10-11 12:03:40 +11:00
Oliver f7d66875c4 Fix: New translations django.po from Crowdin 2021-10-11 12:03:39 +11:00
Oliver 9952ff1eae Fix: New translations django.po from Crowdin 2021-10-11 12:03:38 +11:00
Oliver 7b417460e6 Fix: New translations django.po from Crowdin 2021-10-11 12:03:37 +11:00
Oliver fb943638c0 Fix: New translations django.po from Crowdin 2021-10-11 12:03:35 +11:00
Oliver 1adf77be86 Fix: New translations django.po from Crowdin 2021-10-11 12:03:34 +11:00
Oliver 1235e3e149 Fix: New translations django.po from Crowdin 2021-10-11 12:03:33 +11:00
Oliver af576d5e90 Fix: New translations django.po from Crowdin 2021-10-11 12:03:32 +11:00
Oliver 629dad5e07 Fix: New translations django.po from Crowdin 2021-10-11 12:03:30 +11:00
Oliver 710e0e2c3b Fix: New translations django.po from Crowdin 2021-10-11 12:03:29 +11:00
Oliver 32f13c6bef Fix: New translations django.po from Crowdin 2021-10-11 12:03:28 +11:00
Oliver 2da8c81537 Fix: New translations django.po from Crowdin 2021-10-11 12:03:26 +11:00
OliverandGitHub e45f50acd3 Merge pull request #2133 from SchrodingersGat/convert-out-of-stock 
Allow conversion of out-of-stock items
 2021-10-11 12:00:09 +11:00