inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-30 20:55:42 +00:00
Code Activity
12,426 Commits 6 Branches 132 Tags
89b8d04ca4d57c949745f07630bf6dfc8c3ac11e
Commit Graph

12426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
89b8d04ca4 Merge pull request #2833 from SchrodingersGat/variant-available 
Add 'available_variant_stock' to BomItem serializer
 2022-04-26 18:47:56 +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
c743ededf4 Merge pull request #2873 from SchrodingersGat/build-auto-allocate-fix 
Fix for 'auto-allocate' stock to build orders
 2022-04-26 16:24:34 +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
85fd247878 Fix for 'auto-allocate' stock to build orders 
- Allocation of serialized stock items would cause issue
- Exclude serialized stock from auto allocation process
 2022-04-26 15:54:03 +10:00
Oliver
2696f6bfbd Merge pull request #2869 from SchrodingersGat/ipn-validator-fix 
Adds 'variant_of' filter back into Part API
 2022-04-26 12:05:30 +10:00
Oliver
70d4960fa3 Add new unit tests for part API filters 2022-04-26 11:43:34 +10:00
Oliver
61a56be114 Merge pull request #2870 from SchrodingersGat/pt-br 
pt-br
 2022-04-26 11:40:46 +10:00
Oliver
c705bb57c6 Fix language code 2022-04-26 11:16:55 +10:00
Oliver
64b1f56b98 Generate pt_br 2022-04-26 11:09:21 +10:00
Oliver
b5551a1ceb Adds pt_br (brazillian) 2022-04-26 11:05:40 +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
Oliver
7ae9586c82 Merge pull request #2864 from matmair/remove-dead-code 
Remove dead code
 2022-04-25 08:55:21 +10:00
Matthias
65357df648 PEP fix 2022-04-25 00:27:41 +02:00
Matthias
b72650d162 remove translation script 2022-04-25 00:25:31 +02:00
Matthias
b4068c5e0f remove dead middleware 2022-04-25 00:25:12 +02:00
Oliver
adfcd42e09 Merge pull request #2859 from SchrodingersGat/ipn-validator-fix 
IPN validator fix
 2022-04-22 15:11:33 +10:00
Oliver
99718865c0 Further attempts to fix CI issues 2022-04-22 14:33:46 +10:00
Oliver
4994920119 Use recommended collation option 2022-04-22 13:48:15 +10:00
Oliver
fa3c24b085 Try a different collation option 2022-04-22 13:25:22 +10:00
Oliver
0806e18aca Case sensitive collation 2022-04-22 12:39:42 +10:00
Oliver
2f1e869351 Only set collation option for mysql test database 2022-04-22 11:31:51 +10:00
Oliver
dc0f18d21f Specify charset and collation options for the test database 2022-04-22 11:20:49 +10:00
Oliver Walters
5fde9f552c Add similar check for IPN 2022-04-22 01:00:38 +10:00
Oliver Walters
292d28d378 Account for cases where serial number could be an integer! 2022-04-22 01:00:02 +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
f504dfe797 part variant table now displays information about variant stock quantities 2022-04-22 00:20:32 +10:00
Oliver Walters
8b9aa86a0a Add 'variant_stock' to Part API serializer 2022-04-22 00:14:37 +10:00
Oliver Walters
aa20d84cc1 Update javascript rendering in build table 2022-04-22 00:00:50 +10:00
Oliver Walters
ec34d23bfc Update javascript rendering in BOM table 2022-04-21 23:58:12 +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
42f0628a48 Merge pull request #2858 from SchrodingersGat/docker-init-fix 
Revert location of init.sh for Dockerfile
 2022-04-21 22:29:36 +10:00
Oliver Walters
0cd5a2b005 Revert location of init.sh for Dockerfile 2022-04-21 20:17:12 +10:00
Oliver Walters
1d73f7c066 Update API version info 2022-04-21 20:14:46 +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
Oliver
d647153cc2 Merge pull request #2856 from SchrodingersGat/docker-project-names 
Adds project names for docker-compose files
 2022-04-21 12:30:07 +10:00
Oliver
60097ef57c Merge pull request #2855 from SchrodingersGat/security-fix 
Security patch for django
 2022-04-21 12:11:46 +10:00
Oliver
6d56dbd266 Adds project names for docker-compose files 2022-04-21 12:04:05 +10:00
Oliver
27c807492d Security patch for django 2022-04-21 11:45:09 +10:00
Oliver
d9fcdf8253 Merge pull request #2852 from SchrodingersGat/docker-build-fix 
Add sqlite-config file back in
 2022-04-21 02:01:11 +10:00
Oliver Walters
67196b866e Compose script fixes 
- Define INVENTREE_DB_NAME
- Cache built image
 2022-04-21 01:13:34 +10:00
Oliver Walters
1ac8ae7697 No need to build docker test image on each pull request commit 2022-04-21 01:10:29 +10:00
Oliver Walters
a376625088 Force INVENTREE_DB_USER and INVENTREE_DB_PASSWORD to be set manually 
- Only for the "production" docker setup
 2022-04-21 01:04:46 +10:00
Oliver Walters
ced9c6c050 Sqlite docker-compose file no longer requires .env file 
As this is only used for CI this is OK
 2022-04-21 01:02:55 +10:00
Oliver
12ef35338f Merge pull request #2851 from SchrodingersGat/czech-yourself 
Add Czech language support
 2022-04-21 00:50:31 +10:00