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
4,499 Commits 9 Branches 164 Tags
b64d48544decbfaf5e709d93e18e44ab0da8127f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters b64d48544d Bug fix for trackable parts 2021-02-23 16:49:09 +11:00
OliverandGitHub ad7a70f033 Merge pull request #1351 from SchrodingersGat/report-filter-fix 
Bug fix for label / report filtering
 2021-02-23 16:02:29 +11:00
Oliver Walters 8c9202de21 Bug fix for label / report filtering 2021-02-23 15:40:31 +11:00
OliverandGitHub 94c8bb6805 Merge pull request #1350 from SchrodingersGat/recently-updated 
Adds "Recently Updated Stock" to index page
 2021-02-23 14:47:24 +11:00
Oliver Walters 648d322f54 Style fixes 2021-02-23 14:24:09 +11:00
Oliver Walters 8717be66fc Configure number of "recent items" shown on index page 2021-02-23 14:15:12 +11:00
Oliver Walters 8972a51bd6 Fixes for integer validator for inventree setting 2021-02-23 14:12:16 +11:00
OliverandGitHub 333d6dd1b8 Merge pull request #1348 from SchrodingersGat/supplier-part-admin 
Adds "admin" button to supplier part page
 2021-02-23 13:43:51 +11:00
OliverandGitHub 615e2f8271 Merge pull request #1349 from SchrodingersGat/used-in-filter 
Enable filtering for "used in" table
 2021-02-23 13:43:45 +11:00
Oliver Walters 571a03043e Show recently updated stock items on the index page 2021-02-23 13:43:41 +11:00
Oliver Walters 949a541ee0 Add more options to StockList api 
- Limit query results
- Order by various fields
 2021-02-23 13:43:26 +11:00
Oliver Walters 66e1b180e4 Add option to stock table to disable grouping at run-time 2021-02-23 13:42:59 +11:00
Oliver Walters 39d4ddd845 Enable filtering for "used in" table 2021-02-23 13:23:23 +11:00
Oliver Walters 5a58e0a298 Adds "admin" button to supplier part page 2021-02-23 13:16:03 +11:00
OliverandGitHub 791b14920a Merge pull request #1347 from SchrodingersGat/variant-stock-tab 
Display stock tab for virtual parts
 2021-02-23 12:23:01 +11:00
Oliver Walters 041f056116 Display stock tab for virtual parts 2021-02-23 10:40:52 +11:00
OliverandGitHub 4dc093662d Merge pull request #1344 from SchrodingersGat/sub-build-table 
Build: Filter by parent or ancestor in API
 2021-02-23 09:46:51 +11:00
Oliver Walters 832a6ef9a2 PEP fixes 2021-02-23 09:01:03 +11:00
Oliver Walters 58863b1924 Show child builds 2021-02-22 22:35:54 +11:00
Oliver Walters c1dd5b1ca1 Add "child build" page 2021-02-22 22:21:46 +11:00
Oliver Walters 2186a66465 Build: Filter by parent or ancestor in API 
- Add unit testing
 2021-02-22 22:05:20 +11:00
OliverandGitHub b8327a5531 Merge pull request #1342 from SchrodingersGat/label-improvements 
Label improvements
 2021-02-22 19:45:11 +11:00
OliverandGitHub 613776fbe5 Merge pull request #1343 from SchrodingersGat/part-annotate 
Adds 'suppliers' field to Part serializer
 2021-02-22 19:45:02 +11:00
Oliver Walters 199ba27031 PEP!!! 2021-02-22 18:44:59 +11:00
Oliver Walters cf6a03456f Adds 'suppliers' field to Part serializer 
- Number of supplier parts associated with the Part object
 2021-02-22 18:44:31 +11:00
Oliver Walters 28e9aa4afa More unit fixes 2021-02-22 18:11:40 +11:00
Oliver Walters 9159afe9ce Unit test fix 2021-02-22 17:27:48 +11:00
OliverandGitHub 5d1e6981d8 Merge pull request #1341 from SchrodingersGat/variant-table-fix 
Fixes weird variant display
 2021-02-22 17:21:34 +11:00
Oliver Walters 7582b9ccf4 PEP fixes 2021-02-22 17:02:33 +11:00
Oliver Walters 9fe9cbc795 Fixes weird variant display 
- Seems like the double import was at fault (somehow??)
 2021-02-22 16:57:33 +11:00
Oliver Walters 7d54997cb8 Tweaks 2021-02-22 16:48:00 +11:00
Oliver Walters bf51e1bfb1 Update label templates 
- New ones are automatically copied across now
 2021-02-22 16:39:38 +11:00
Oliver Walters da715d7381 Refactoring label printing 2021-02-22 16:12:13 +11:00
Oliver Walters caf4c293d9 Rename "barcode" module to "barcodes" to prevent import shadowing 
- Add 'barcode' support
 2021-02-22 15:15:25 +11:00
Oliver Walters 23da591c22 Remove old dependency on django_qr_code 2021-02-22 15:00:12 +11:00
Oliver Walters 828b3adc49 Update requirements.txt 
- Remove blabel
- Remove django-qr-code
- Add python-barcode
- Add qrcode
 2021-02-22 14:40:40 +11:00
Oliver Walters a742df2c12 Adds 'length' and 'width' fields to label models 2021-02-22 10:10:58 +11:00
OliverandGitHub ad6c69ecc7 Merge pull request #1336 from SchrodingersGat/app-info 
Add app info to about dialog
 2021-02-22 08:59:23 +11:00
Oliver Walters 89cdcda614 Add app info to about dialog 2021-02-22 01:10:11 +11:00
OliverandGitHub beb155133a Update version.py 2021-02-21 21:50:52 +11:00
OliverandGitHub 2ac9eadd13 Update version.py 2021-02-21 21:49:38 +11:00
OliverandGitHub d426e376c4 Merge pull request #1333 from SchrodingersGat/cleaner-homepage 
Cleaner homepage
 2021-02-21 21:36:28 +11:00
Oliver Walters 2b1101e165 remove unused files 2021-02-21 21:09:55 +11:00
Oliver Walters afd7199a69 Cleanup search page too 2021-02-21 21:06:52 +11:00
Oliver Walters 745188082b Add more searchable fields to SupplierPart model 2021-02-21 21:06:44 +11:00
Oliver Walters e53c6e9975 Fancy 2021-02-21 20:29:48 +11:00
OliverandGitHub cc2b672117 Merge pull request #1335 from SchrodingersGat/stock-filter 
Add option to filter out variants in stock table
 2021-02-21 20:28:30 +11:00
Oliver Walters d11adf3b34 fade in 2021-02-21 20:18:14 +11:00
Oliver Walters dffff89e9d Add option to filter out variants in stock table 2021-02-21 20:08:23 +11:00
Oliver Walters 9d12d43574 Cleanup / refactor 2021-02-19 18:10:10 +11:00
Oliver Walters 116ea65160 Show / hide panels 2021-02-19 17:57:38 +11:00
Oliver Walters 6df6a460e4 Add items using javascript 2021-02-19 17:48:32 +11:00
OliverandGitHub b95d6a4ab2 Merge pull request #1327 from SchrodingersGat/installed-test-results 
Read test results from installed items
 2021-02-19 16:49:51 +11:00
Oliver Walters 6037f1452a Unit testing for new feature 2021-02-19 15:50:32 +11:00
Oliver Walters beeb94785d Add option for TestReport to include tests for installed items 2021-02-19 15:50:25 +11:00
OliverandGitHub e02fb8c8fa Merge pull request #1332 from SchrodingersGat/destroyed-stock-adjust 
Allow adjustment for destroyed (or lost) stock
 2021-02-19 15:40:10 +11:00
Oliver Walters ea4b713eed Allow adjustment for destroyed (or lost) stock 2021-02-19 15:13:56 +11:00
OliverandGitHub ca16e4f35d Merge pull request #1330 from SchrodingersGat/supplier-part-packaging 
Display supplier part packaging
 2021-02-19 15:02:34 +11:00
Oliver Walters ba71ce941f Display supplier part packaging 2021-02-19 14:34:21 +11:00
OliverandGitHub 5b549b8dea Merge pull request #1329 from SchrodingersGat/stock-packaging 
Stock packaging
 2021-02-19 12:52:38 +11:00
Oliver Walters 098b494047 Add option to disable stock item grouping 2021-02-19 11:31:38 +11:00
Oliver Walters e8bacbe45f Edit packaging field 2021-02-19 11:11:22 +11:00
Oliver Walters 644583f636 Display packaging info in stock table 2021-02-19 11:09:24 +11:00
Oliver Walters 556d6455e8 Add "packaging" field for StockItem 2021-02-19 11:08:58 +11:00
Oliver Walters a9f255be85 Prevent stock item being added as an installed item inside itself 2021-02-18 18:01:41 +11:00
Oliver Walters ef23ab1abc Adds functionality for traversing "through" installed items to extract test results 2021-02-18 17:59:04 +11:00
OliverandGitHub cdb3dd2aa5 Merge pull request #1325 from SchrodingersGat/build-bom-view 
Adds "required parts" tab to build view
 2021-02-18 17:58:20 +11:00
Oliver Walters 0c053c6339 Add action buttons to order or build stock 2021-02-18 17:25:39 +11:00
Oliver Walters bfbcbe252b Adds "required parts" tab to build view 2021-02-18 17:14:57 +11:00
OliverandGitHub 8cb3d6ab0a Merge pull request #1321 from SchrodingersGat/next-build-order 
Logic fix for "guessing" next build order number
 2021-02-18 16:08:58 +11:00
Oliver Walters 43a7359501 Logic fix for "guessing" next build order number 2021-02-18 15:44:43 +11:00
OliverandGitHub d2d842163d Merge pull request #1320 from SchrodingersGat/inherited-bom-used-in 
Implement filtering which accommodates new inheritable BOM feature
 2021-02-18 15:19:15 +11:00
Oliver Walters 0f60482e09 Add secondary dialog for creating new supplier 2021-02-18 14:59:13 +11:00
Oliver Walters 1b73f56937 modal content wrapper for secondary modal 2021-02-18 14:56:35 +11:00
Oliver Walters e75b9d04fe PEP fix 2021-02-18 14:38:25 +11:00
Oliver Walters 7a51e6cf78 Implement filtering which accommodates new inheritable BOM feature 
- Can no longer filter bom_items by sub_part
- Adds get_used_in_filter() and get_used_in() for part model (returns a query of other part objects)
 2021-02-18 14:35:21 +11:00
OliverandGitHub 25ada20a19 Merge pull request #1315 from SchrodingersGat/copy-bom-fix 
Fix for duplicating BOM
 2021-02-18 08:22:05 +11:00
Oliver Walters 07ee27ad9b Another CSS tweak 2021-02-18 00:49:36 +11:00
Oliver Walters 3822b60bb0 CSS tweaks 2021-02-18 00:49:16 +11:00
Oliver Walters abe1018abe Add new fields to BOM item hash 2021-02-18 00:40:30 +11:00
Oliver Walters 8caf6bad10 Fix for duplicating BOM 
- Do not duplicate bom items which are "inherited"
 2021-02-18 00:38:40 +11:00
OliverandGitHub bf63005731 Merge pull request #1313 from SchrodingersGat/inherited-bom-items 
Inherited bom items
 2021-02-18 00:30:52 +11:00
Oliver Walters 3f30421ba9 bug fix 2021-02-17 23:57:45 +11:00
Oliver Walters ef902fc313 Add bom_items to build order report context 2021-02-17 23:27:09 +11:00
Oliver Walters bb3440a8a4 Refactor bom item filter 
- Also updates a number of part functions to make use of inherited BOM items
 2021-02-17 22:53:56 +11:00
Oliver Walters 1eb2456e3d Display inherited rows a bit differenter 2021-02-17 22:25:43 +11:00
Oliver Walters 5b402b6bc0 BOM table formatting 
- Display link to external BOM
- Prevent item from being edited to selected
 2021-02-17 22:18:32 +11:00
Oliver Walters 43eba3f7ec Add ability to include bom items inherited from parent parts in the API list 2021-02-17 22:05:17 +11:00
Oliver Walters 40d75090a7 Add 'inherited' flag to API 2021-02-17 21:53:26 +11:00
Oliver Walters d692c18274 Add 'inherited' field to BomItem 2021-02-17 21:53:15 +11:00
OliverandGitHub 69708b842c Merge pull request #1309 from SchrodingersGat/order-requirement 
Order requirement
 2021-02-17 14:42:17 +11:00
Oliver Walters afc33c59ea bug fix 2021-02-17 14:13:56 +11:00
Oliver Walters 08cc866e74 Add function to make barcode for build order 2021-02-17 13:47:14 +11:00
Oliver Walters 98bd7dfa9a Style fixes 2021-02-17 13:16:15 +11:00
Oliver Walters fcc35f2260 Fix display of parts currently being built 2021-02-17 13:14:27 +11:00
Oliver Walters ba542dcbdb Auto-fill build quantity 2021-02-17 13:06:18 +11:00
Oliver Walters c8650ce34c Bug fix for tables 2021-02-17 13:05:58 +11:00
Oliver Walters 8780b8435a style fix 2021-02-17 12:46:05 +11:00
Oliver Walters 34df19242c Adds more context data 2021-02-17 11:08:11 +11:00
Oliver Walters 28c9c80f54 Calculate quantity required for sales orders 
- Cache data going to part detail view
 2021-02-17 10:57:17 +11:00