Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,634 Commits 6 Branches 99 Tags 484 MiB
90593a187c
Commit Graph

9634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
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
Oliver
05791a8efd
Merge pull request #2138 from rocheparadox/master 
Custom name format for parts - FR InvenTree#2085
 2021-10-14 16:03:58 +11:00
rocheparadox
5a6bea3452 improve regex for part name format validation 
proper import of validation
 2021-10-14 09:35:26 +05:30
rocheparadox
ee9e01fc22 removed unused import 2021-10-14 09:26:26 +05:30
rocheparadox
8cad687e43 Moved part name format validation to InvenTree.validators.py from common.models 
validation to check if a field exists in part model
 2021-10-14 09:23:21 +05:30
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
Oliver
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
Oliver
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
Oliver
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
Oliver
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
Roche
b2670f3565
Merge pull request #1 from matmair/pr/rocheparadox/2138 
fix default setting to not change current behaviour
 2021-10-13 22:06:56 +05:30
Matthias
147d2d4631
fix default setting to not change current behaviour 2021-10-13 17:40:50 +02:00
Oliver
0581885ad5 Simplify BOM table buttons 2021-10-14 00:26:34 +11:00
Oliver
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
rocheparadox
0742fb063c comment cleanup 2021-10-13 10:58:36 +05:30
rocheparadox
294011a973 Merge remote-tracking branch 'upstream/master' 2021-10-13 10:10:59 +05:30
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
Oliver
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
rocheparadox
5f159e5f02 Merge remote-tracking branch 'upstream/master' 2021-10-12 20:07:14 +05:30
rocheparadox
a01918d4b9 removed blank line at the end of file 2021-10-12 19:54:09 +05:30
rocheparadox
4fddc656c4 removed unused import 
added unit tests for PART_NAME_FORMAT
 2021-10-12 19:51:21 +05:30
Oliver
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