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
10,546 Commits 6 Branches 99 Tags 484 MiB
b1fbac925d
Commit Graph

10546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthias
9aaf4c25e1
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-12 22:23:45 +02: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
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
rocheparadox
2bf51b0ac3 Added PART_NAME_FORMAT to Inventree settings and exposed the same in settings window with a validator 2021-10-12 19:06:23 +05:30
rocheparadox
f4239fbfd3 Merge remote-tracking branch 'upstream/master' 2021-10-12 18:54:51 +05:30
Oliver Walters
4eb8c60ee0 Add new BomItemSubstitute model 2021-10-12 22:22:49 +11:00
Oliver
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
Oliver
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
rocheparadox
beadfb4659 Merge remote-tracking branch 'upstream/master' 2021-10-11 22:29:01 +05:30
rocheparadox
2d77b21a4e PART_NAME_FORMAT is introduced to display the names of parts in custom format. - For Feature Request InvenTree#2085 
full_name construction in part.js is obsolete/redundant since the same is constructed in backend and sent through api response
 2021-10-11 22:21:12 +05:30
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
Oliver
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