inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-03 12:13:02 +00:00
Code Activity
12,411 Commits 7 Branches 165 Tags
3ef0386593e49250f99cc3f0b4fe0ceff5a9b1a5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver 3ef0386593 Prevent inactive or trackable parts from being 'auto allocated' 2022-04-26 17:14:47 +10:00
OliverandGitHub 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 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 7ae9586c82 Merge pull request #2864 from matmair/remove-dead-code 
Remove dead code
 2022-04-25 08:55:21 +10:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 12ef35338f Merge pull request #2851 from SchrodingersGat/czech-yourself 
Add Czech language support
 2022-04-21 00:50:31 +10:00
Oliver Walters 0974fde59e Add sqlite-config file back in 
- required for CI steps
- might refactor this out later on
 2022-04-21 00:34:24 +10:00
OliverandGitHub b3d96801af Merge pull request #2850 from SchrodingersGat/docker-refactor 
Docker refactor
 2022-04-21 00:31:14 +10:00
Oliver Walters 2b8ddd58a8 Add initial translation files 2022-04-21 00:18:39 +10:00
Oliver Walters 7dce7779c3 cz -> cs 2022-04-21 00:14:38 +10:00
Oliver Walters 2144506745 Add language support for Czech 2022-04-21 00:12:53 +10:00
Oliver Walters e15a4b73cd Restore docker-compose.sqlite.yml 
This is used for docker build testing in CI!
 2022-04-21 00:03:48 +10:00
Oliver Walters 0c93009bf7 Tweaks to dockerfile 2022-04-21 00:01:11 +10:00
Oliver Walters 6929d07f42 Cache the pre-built image 
- The worker container can then use it
- Saves a *lot* of time (and otherwise wasted resources)
 2022-04-20 23:52:56 +10:00
Oliver Walters e87e478009 Fix env file reference for docker-compose.yml (development) 2022-04-20 23:34:50 +10:00
Oliver Walters 85feb30812 Refactor development docker-compose setup 2022-04-20 23:15:37 +10:00
Oliver Walters 0b3aac21ea The production docker-compose file now no longer needs to be touched at all 
Everything can be specified in the .env file!
 2022-04-20 22:46:25 +10:00
Oliver Walters c3fff02bd8 Automatically create a database (with the correct name) when the db container is started! 2022-04-20 22:11:07 +10:00
Oliver Walters a50f26e84d Adjust naming of nginx production file 2022-04-20 21:52:25 +10:00
Oliver Walters e4e735a71b Refactoring docker-compose.postgresql.yml 
- Do not require duplication of username / password values
- Specify different env file
- Move to a new child directory which simplifies setup
 2022-04-20 21:44:22 +10:00
Oliver Walters f0a01587ac Rename default docker-compose file 2022-04-20 21:18:12 +10:00
OliverandGitHub aec7d2d0aa Merge pull request #2842 from awiswasi/vulnerability-fix 
Fixed vulnerability in jquery-ui@1.12.1
 2022-04-20 11:11:58 +10:00
OliverandGitHub 8d51c592e7 Merge pull request #2843 from matmair/plugin-mark-sample 
Mark sample plugins
 2022-04-20 09:20:00 +10:00
OliverandGitHub ad541903c8 Merge pull request #2841 from SchrodingersGat/x-forwarded-for 
X-forwarded-for
 2022-04-20 07:02:52 +10:00
Oliver Walters 85c8b94d80 Update nginx conf files 2022-04-19 22:09:30 +10:00
Oliver Walters 7c126ed712 Added x_forwarded_for middleware 
Used to extract remote client IP (when behind balancer / proxy / etc)
 2022-04-19 21:19:25 +10:00
OliverandGitHub 8a82f22378 Merge pull request #2840 from SchrodingersGat/batch-install 
Batch install
 2022-04-19 21:15:42 +10:00
Oliver Walters db897d5dce JS linting 2022-04-19 20:47:37 +10:00
Oliver Walters 5fe2fb615b Style fixes 2022-04-19 20:41:08 +10:00
Oliver Walters 1fb94bf04b Allow "tracked" stock items to be installed, rather than just serialized 2022-04-19 20:35:54 +10:00
Oliver Walters 0e67ea8e95 Change ordering of stock item form fields 2022-04-19 20:28:45 +10:00
Oliver Walters 7531ef8e5f Prevent annoying error messages when notification request fails 2022-04-19 20:28:35 +10:00
Oliver Walters cffeb62bd1 Bug fix for StockItem.clean() 2022-04-19 20:28:13 +10:00
Oliver Walters 141f6ccbdf Increase unit testing for StockItem API 2022-04-19 20:10:07 +10:00
Oliver Walters 2315d0cb5d Adds ability to filter stock item tables by "tracked" status 
- Also fixes some slight errors in the API filtering logic
 2022-04-19 18:13:48 +10:00
Oliver Walters d213e1fdc7 Move API version information into a new file 
- Keeping track of the API version history was making for a very long file!
 2022-04-19 18:11:52 +10: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 1dfbd30294 Bug fix for displaying batch information 2022-04-19 17:53:58 +10:00
Oliver Walters 1519a4f882 Merge remote-tracking branch 'inventree/master' 2022-04-19 17:45:21 +10:00
OliverandGitHub 3563fd8c25 Merge pull request #2839 from SchrodingersGat/persian-language 
Adds persian language support
 2022-04-19 17:14:30 +10:00
Oliver e33d970beb Add persian translation files 2022-04-19 16:36:52 +10:00
Oliver 584c06d045 Add support for fa (farsi / persian) 2022-04-19 16:31:38 +10:00
OliverandGitHub 71b4c64e4d Merge pull request #2837 from SchrodingersGat/variant-tracking 
Variant tracking
 2022-04-19 16:08:38 +10:00
Oliver 5f503c7e0f PEP fxies 2022-04-19 13:16:45 +10:00
Oliver 5240c60e0b Render part information in stock item tracking table (if provided) 2022-04-19 13:14:54 +10:00
Oliver e5eb1f4513 Adds button to refresh stock item tracking table 2022-04-19 13:09:14 +10:00
Oliver 48170ee096 Update stock item variant conversion form to use new function 2022-04-19 13:04:17 +10:00
Oliver 87de7e4beb Adds "convert_to_variant" function for the StockItem model 2022-04-19 12:52:36 +10:00
Oliver ab114b52e9 Add new CONVERTED_TO_VARIANT tracking code 2022-04-19 12:46:08 +10:00
OliverandGitHub 65ee15cace Merge pull request #2836 from SchrodingersGat/batch-in-forms 
Batch in forms
 2022-04-18 23:43:38 +10:00
Oliver Walters 1cddb565da PEP fixes 2022-04-18 23:20:59 +10:00
Oliver Walters 8a6b16c1d1 Display batch code for stock items in forms 2022-04-18 23:10:38 +10:00
Oliver Walters 6beea0a557 Render batch code in stock adjustment dialog 2022-04-18 22:56:31 +10:00
Oliver Walters 33401cb207 Adds ability to filter stockitem list by "has_batch" parmeter 2022-04-18 22:34:00 +10:00
OliverandGitHub 5f455a6ee8 Merge pull request #2834 from rkalman/fix-so-panel-load 
Fixes loading of SO table on company page
 2022-04-17 01:46:08 +10:00
OliverandGitHub cf9bd62f9b Merge pull request #2832 from SchrodingersGat/top-level-parents 
Explicitly mark "parent" field in PartCategory and StockLocation
 2022-04-15 22:32:53 +10:00
Oliver Walters 18de4676dc Explicitly mark "parent" field in PartCategory and StockLocation as not required in API form fields 2022-04-15 19:22:06 +10:00
Oliver Walters 7164271925 Merge remote-tracking branch 'inventree/master' 2022-04-15 19:12:36 +10:00
OliverandGitHub d43158ab1b Merge pull request #2828 from SchrodingersGat/installed-in 
Adds ability to include tests results from "installed items"
 2022-04-14 13:17:03 +10:00
Oliver 688f53fdb1 Bump API version number 2022-04-14 12:52:09 +10:00
Oliver dfa3bbf655 Add ability to include test results from "installed items" in table 2022-04-14 12:49:27 +10:00
Oliver 46892f9288 Hide ID values by default in model_renderers.js 2022-04-14 12:30:01 +10:00
OliverandGitHub df2f7d195a Merge pull request #2827 from SchrodingersGat/variant-stock 
Allocation quantity functions include variants
 2022-04-14 12:26:17 +10:00
OliverandGitHub 41959eaaba Merge pull request #2826 from SchrodingersGat/can-build 
Show "can build" detail even for template parts
 2022-04-14 12:07:18 +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
OliverandGitHub 58d9ca93e0 Merge pull request #2825 from SchrodingersGat/trans-fix 
Fix templated string
 2022-04-14 11:39:13 +10:00
Oliver 40d6a1470f Tweak for part.js 2022-04-14 11:04:25 +10:00
Oliver 7335bfae19 Fix templated string 2022-04-14 10:59:52 +10:00