2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-13 07:10:53 +00:00
Commit Graph

2607 Commits

Author SHA1 Message Date
Matthias
ff9d8e7b6b use instance title in version string 2022-04-24 00:28:27 +02:00
Matthias
7834171c2a [FR] White labeling
Fixes #2301
2022-04-23 23:38:49 +02:00
Matthias Mair
2f0291864f Merge branch 'inventree:master' into matmair/issue2385 2022-04-23 21:29:37 +02:00
Oliver
99718865c0 Further attempts to fix CI issues 2022-04-22 14:33:46 +10:00
Oliver Walters
5fde9f552c Add similar check for IPN 2022-04-22 01:00:38 +10:00
Oliver Walters
aa4df62ac9 IPN fix 2022-04-22 00:40:23 +10:00
Oliver Walters
a7c18891b5 Increase unit testing for duplicate IPN testing
- IPN duplication test is case sensitive!
2022-04-22 00:38:08 +10:00
Oliver Walters
9a9ed5f192 Fix validation of duplicate IPN
- Duplicate IPN check does not apply if an empty IPN value is set
- Note that "if x" is a more pythonic test than "if x not in [None, '']"
2022-04-22 00:36:30 +10:00
Oliver Walters
6dec8ba113 PEP fix 2022-04-22 00:24:25 +10:00
Oliver Walters
8b9aa86a0a Add 'variant_stock' to Part API serializer 2022-04-22 00:14:37 +10:00
Oliver Walters
fa2510c42f Use a proper queryset annotation to calculate the "available_variant_stock" 2022-04-21 23:53:03 +10:00
Oliver Walters
3b4d0c2f9c Merge remote-tracking branch 'inventree/master' into variant-available
# Conflicts:
#	InvenTree/InvenTree/version.py
2022-04-21 20:13:51 +10:00
Matthias Mair
1399b4fbb3 Merge branch 'inventree:master' into matmair/issue2385 2022-04-19 18:23:49 +02:00
Oliver Walters
39a77f7f3a Adds a "stock items" view for a part category
- Shows any stock items for parts which exist in (or under) the selected category
2022-04-19 18:04:48 +10:00
Oliver Walters
86c7417296 Remove old template file 2022-04-19 17:58:54 +10:00
Oliver Walters
4313503649 PEP fix 2022-04-15 22:47:32 +10:00
Oliver Walters
d535e4fa12 Add 'available_variant_stock' to BomItem serializer
- Note: This is definitely *not* the optimum solution here
2022-04-15 22:38:31 +10:00
Oliver
df2f7d195a Merge pull request #2827 from SchrodingersGat/variant-stock
Allocation quantity functions include variants
2022-04-14 12:26:17 +10:00
Oliver
35aa5f25be Allocation quantity functions include variants
- For calculation of total "available_stock", variants are included
- Update the allocation quantity functions to also include variants
- Otherwise, the calculations are "out of sync"
2022-04-14 11:54:30 +10:00
Oliver
bcbfc9c292 Show "can build" detail even for template parts 2022-04-14 11:40:22 +10:00
Oliver
93257d547c Merge pull request #2806 from SchrodingersGat/bom-serializer-quantity
Bom serializer quantity
2022-04-13 07:43:25 +10:00
Oliver Walters
c7257a1bd3 build order 2022-04-10 20:03:40 +10:00
Oliver Walters
df9c5c0048 Refactor notes editing for "StockItem" 2022-04-10 18:08:09 +10:00
Oliver Walters
e1784c93b2 Simplification 2022-04-10 18:03:19 +10:00
Oliver Walters
641785a02b Refactor into a monolithic js function 2022-04-10 17:53:09 +10:00
Oliver Walters
957494f483 Custom headings 2022-04-10 16:29:31 +10:00
Oliver Walters
241e2e35c0 Display part notes inline, and allow updating via API 2022-04-10 15:58:36 +10:00
Oliver Walters
82b8230a7e Prune some dead code 2022-04-10 15:36:27 +10:00
Oliver Walters
b7937a4750 Add some more unit tests for BOM API endpoints 2022-04-09 19:22:12 +10:00
Oliver Walters
78ed5d9cc4 Some more API unit tests 2022-04-08 21:59:59 +10:00
Oliver Walters
8ab54c8e55 Add more unit tests 2022-04-08 21:39:41 +10:00
Matthias
3ffe51b4c3 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2385 2022-04-08 01:58:17 +02:00
Oliver Walters
be9648cbc7 Remove unused function which shadowed name of query annotation 2022-04-07 19:22:20 +10:00
Oliver Walters
e225d3b765 Fix action buttons in "part" table on category page 2022-04-07 19:09:43 +10:00
Oliver Walters
ed69f06620 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-07 18:54:00 +10:00
Oliver Walters
eef768e01f Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity 2022-04-07 18:53:43 +10:00
Oliver Walters
ba81e6caf9 Style fixes 2022-04-07 18:50:10 +10:00
eeintech
ad366ef0bd Fix part and po files import 2022-04-06 16:45:23 -04:00
Oliver Walters
dc2da4bcb9 BomItem API - improve annotation of available substitute stock quantity 2022-04-05 21:24:57 +10:00
Oliver Walters
30a4c38eb7 Ensure queryset is properly annotated for BomItem detail 2022-04-05 21:12:43 +10:00
Oliver Walters
e0acfe492b Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity 2022-04-05 19:49:06 +10:00
Matthias Mair
41b75e4928 Merge branch 'inventree:master' into matmair/issue2385 2022-04-05 02:05:05 +02:00
Matthias
347be2aa3a fix test 2022-04-05 01:58:28 +02:00
Matthias
785cdc5267 patch loading methods for selective loading 2022-04-05 01:29:19 +02:00
Matthias
42f630cff1 fix tests
due to changes in the loading mechansim they need to be fethced now
2022-04-05 01:10:52 +02:00
Matthias
ad9d067033 typo fix 2022-04-05 01:08:35 +02:00
Matthias
1eb511e8a0 user notification settings 2022-04-04 23:46:19 +02:00
Oliver Walters
0908aa8c8c Allow sorting of part table by unallocated_stock 2022-04-05 00:31:44 +10:00
Oliver Walters
e4ca638a2e Add field for substitute_stock (work in progress) 2022-04-04 23:52:45 +10:00
Oliver Walters
c6ba104ae8 Condense into single "available_stock" field 2022-04-04 23:07:44 +10:00