inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-10 22:00:56 +00:00
Code Activity
12,827 Commits 5 Branches 122 Tags
fe4b264ae176fea31f8ff0dfb24c9e7047eb32da
Commit Graph

2341 Commits

Author SHA1 Message Date
Matthias
fe4b264ae1 Fix user check 2022-05-06 00:11:26 +02:00
Matthias Mair
a6bede877a Merge branch 'inventree:master' into matmair/issue2385 2022-05-04 15:11:56 +02:00
Matthias
1a3d482e42 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2788 2022-05-04 12:33:21 +02:00
Matthias Mair
cf93ba7cf9 Merge branch 'inventree:master' into matmair/issue2385 2022-05-04 12:23:05 +02:00
Oliver Walters
f0e8e32c8a More refactoring 2022-05-03 17:27:21 +10:00
Matthias
e7b189ba29 fix templates 2022-05-02 22:41:24 +02:00
Matthias Mair
4125803e6d Merge branch 'inventree:master' into matmair/issue2385 2022-05-02 21:50:52 +02:00
Oliver Walters
e87a02638e Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js
 2022-05-02 16:11:11 +10:00
Matthias
de6507e918 update translation commands 2022-05-01 22:03:49 +02:00
Matthias
67ab45bdee update depreciated paths 2022-05-01 22:00:18 +02:00
Matthias
d05472b30c upgrade to pyhton 3.9 syntax 
using pyupgrade
 2022-05-01 21:53:12 +02:00
Matthias Mair
c18579088a Merge branch 'inventree:master' into matmair/issue2385 2022-04-30 19:53:32 +02:00
Oliver
6538ab86cb Bug fix for 'required' filter in PartTestTemplate API 2022-04-28 16:25:04 +10:00
Oliver
e9500e4981 Merge pull request #2892 from SchrodingersGat/build-allocation-fix 
Fix part allocation check
 2022-04-28 15:21:02 +10:00
Oliver
aec10e0cc7 Fix part allocation check 2022-04-28 14:58:05 +10:00
Matthias Mair
37e74074dd Merge branch 'inventree:master' into matmair/issue2385 2022-04-27 17:46:57 +02:00
Oliver Walters
fc4de6c7b8 Remove other demo references 2022-04-27 22:00:58 +10:00
Oliver Walters
090445f2c3 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-27 21:45:08 +10:00
Matthias
6c23c94700 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2301 2022-04-27 13:13:04 +02:00
Oliver
f98225334e Simplify allocation display for part page 2022-04-27 15:36:44 +10:00
Oliver Walters
b8ca7fb092 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/templates/js/translated/model_renderers.js
 2022-04-26 21:22:31 +10:00
Oliver Walters
0b51ca2902 PEP fixes 2022-04-26 19:54:16 +10:00
Oliver Walters
7db11b627b Refactor PartSalePriceBreak and PartInternalPriceBreak tables to use the API 
- Remove old server-side views
- Simplify code
 2022-04-26 19:53:09 +10:00
Oliver Walters
cb12222e17 Re-enable the "pricing" tab 
- Previously was gated entirely on the "PART_SHOW_PRICE_HISTORY" setting
 2022-04-26 19:23:41 +10:00
Oliver
4c6c618af6 Merge pull request #2874 from SchrodingersGat/auto-allocate-fix 
Prevent inactive or trackable parts from being 'auto allocated'
 2022-04-26 18:48:16 +10:00
Oliver
3ef0386593 Prevent inactive or trackable parts from being 'auto allocated' 2022-04-26 17:14:47 +10:00
Oliver
ee47be4c9e Add unit test for 'available_variant_stock' in BomItem API serializer 2022-04-26 17:05:21 +10:00
Oliver
7aaa4a5812 add unit tests for new variant_stock annotations 2022-04-26 16:39:03 +10:00
Oliver
d4fc4bb8bd Merge branch 'master' into variant-available 
# Conflicts:
#	InvenTree/InvenTree/api_version.py
 2022-04-26 16:21:53 +10:00
Oliver
70d4960fa3 Add new unit tests for part API filters 2022-04-26 11:43:34 +10:00
Oliver
693e47ab89 Remove outdated filter_fields variable 2022-04-26 11:02:22 +10:00
Oliver
e1e0432963 Adds 'variant_of' filter back into Part API 2022-04-26 10:57:43 +10:00
Matthias
1bce7b745e add custom logo option 2022-04-24 16:13:44 +02:00
Matthias
1127bf2497 make it possible to resitrict the about modal 2022-04-24 01:02:41 +02:00
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