Commit Graph
100 Commits
Author SHA1 Message Date
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
OliverandGitHub bfb8e61df5 Merge pull request #2824 from matmair/patch-1
re-add plugin on startup switch
2022-04-14 09:49:39 +10:00
Oliver Walters 57546dd115 Merge remote-tracking branch 'inventree/master' 2022-04-13 21:56:32 +10:00
OliverandGitHub 0233aa8bee I18n merge (#2821)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2022-04-13 12:27:40 +10:00
OliverandGitHub 93257d547c Merge pull request #2806 from SchrodingersGat/bom-serializer-quantity
Bom serializer quantity
2022-04-13 07:43:25 +10:00
OliverandGitHub fe8f5a74e7 Merge pull request #2816 from SchrodingersGat/markdown-editor
Markdown editor
2022-04-10 22:44:57 +10:00
Oliver Walters 7276fafcc5 Unit test fix 2022-04-10 20:25:05 +10:00
Oliver Walters 9e59d90e0e Pin bleach package version
(cherry picked from commit 7af9e9123e)
2022-04-10 20:24:41 +10:00
Oliver Walters c7257a1bd3 build order 2022-04-10 20:03:40 +10:00
Oliver Walters 1c60d4e152 Refactor notes for "purchase order" 2022-04-10 19:55:32 +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 953c7bc7e4 Adds easymde (v2.16.1) 2022-04-10 15:34:02 +10:00
Oliver Walters b7937a4750 Add some more unit tests for BOM API endpoints 2022-04-09 19:22:12 +10:00
Oliver Walters 7af9e9123e Pin bleach package version 2022-04-09 19:15:21 +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
Oliver Walters 49f095b15c Bump API version 2022-04-07 19:37:16 +10:00
Oliver Walters be9648cbc7 Remove unused function which shadowed name of query annotation 2022-04-07 19:22:20 +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
Oliver Walters f3075d2151 Build table now also shows availability of substitute stock 2022-04-07 18:48:23 +10:00
Oliver Walters acc6cb8729 Fix calculation of "can_build" 2022-04-07 17:47:24 +10:00
Oliver Walters 6aceb24e41 Include available substitute stock when calculating total availability in BOM table 2022-04-07 17:45:11 +10:00
OliverandGitHub d0fa40a408 Merge pull request #2812 from eeintech/fix_upload
Fix part and po files import
2022-04-07 08:23:02 +10:00
Oliver Walters e3186b5573 Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity 2022-04-06 18:01:10 +10:00
OliverandGitHub c31bbe5c42 Merge pull request #2809 from SchrodingersGat/fix-inactive-search
Bug fix for "inverted" logic in search results
2022-04-06 12:46:18 +10:00
Oliver 24c64d7479 Bug fix for "inverted" logic when hiding inactive parts from search results 2022-04-06 12:21:19 +10:00
OliverandGitHub b78407a7e8 Merge pull request #2808 from SchrodingersGat/cancel-requests
Fix search errors
2022-04-06 10:38:03 +10:00
Oliver 27dac5af97 Fix search errors
- Do not show API error messages for requests which were intentionally aborted
- Prevents a large number of error messages being displayed when search text is changed
2022-04-06 09:42:07 +10:00
OliverandGitHub ac721a544d Merge pull request #2803 from SchrodingersGat/barcode-fix
Barcode scanning fixes
2022-04-06 09:27:42 +10: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
OliverandGitHub 0ff754c7d9 Merge pull request #2804 from SchrodingersGat/quantity-fixes
Quantity fixes
2022-04-05 08:20:18 +10:00
Oliver Walters c93f9c94f3 Change column title 2022-04-05 00:33:54 +10:00
Oliver Walters 0908aa8c8c Allow sorting of part table by unallocated_stock 2022-04-05 00:31:44 +10:00
Oliver Walters 58003bc2cb Refactor model renderer functions 2022-04-05 00:27:37 +10:00
Oliver Walters 15253435af Adjustments for partStockLabel function 2022-04-05 00:02:11 +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
Oliver Walters f6664b2477 Add annotated fields to BomItem API:
- total-stock / allocated_to_build_orders / allocated_to_sales_orders
2022-04-04 22:50:13 +10:00
Oliver 782a0f3576 Fix for scanIntoLocation function 2022-04-04 16:23:17 +10:00
Oliver 7dae05acc5 Fix for scanItemsIntoLocation function
- Accept list of objects rather than pk values
- Conform to API requirements
2022-04-04 16:20:19 +10:00
Oliver 2c8e274aa9 Tweaks for barcode scanning functionality
- Prevent javascript errors

(cherry picked from commit 9129a42a3e2a5c5939e6002d3b4010b3fd9cc20e)
2022-04-04 14:24:28 +10:00