Commit Graph

5177 Commits

Author SHA1 Message Date
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
Oliver Walters
b805cfabb0 Merge remote-tracking branch 'inventree/master' 2021-02-22 09:47:46 +11:00
Oliver
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
Oliver
beb155133a
Update version.py 2021-02-21 21:50:52 +11:00
Oliver
2ac9eadd13
Update version.py 2021-02-21 21:49:38 +11:00
Oliver
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
Oliver
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
Oliver
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
Oliver
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
Oliver
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
Oliver
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
d944e7916e Merge remote-tracking branch 'inventree/master' 2021-02-18 22:06:32 +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
Oliver
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
Oliver
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
Oliver
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
Oliver
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