Commit Graph

12549 Commits

Author SHA1 Message Date
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
Oliver
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
Oliver
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
Kálmán Rózsahegyi
7cbefa5fb7 Fixes loading of SO table on company page 2022-04-16 17:09:28 +02:00
Oliver Walters
4313503649 PEP fix 2022-04-15 22:47:32 +10:00
Oliver Walters
6f5b560fb6 Update BOM table to include variant stock information 2022-04-15 22:45:22 +10:00
Oliver Walters
7f07c52689 Incremement APi version 2022-04-15 22:40:24 +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
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
Oliver
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
Oliver
df2f7d195a
Merge pull request #2827 from SchrodingersGat/variant-stock
Allocation quantity functions include variants
2022-04-14 12:26:17 +10:00
Oliver
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
Oliver
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
Oliver
bfb8e61df5
Merge pull request #2824 from matmair/patch-1
re-add plugin on startup switch
2022-04-14 09:49:39 +10:00
Matthias Mair
a6a03acf92
re-add plugin on startup switch 2022-04-14 01:22:09 +02:00
Oliver Walters
57546dd115 Merge remote-tracking branch 'inventree/master' 2022-04-13 21:56:32 +10:00
Oliver
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
Oliver
93257d547c
Merge pull request #2806 from SchrodingersGat/bom-serializer-quantity
Bom serializer quantity
2022-04-13 07:43:25 +10:00
Oliver
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