Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,763 Commits 6 Branches 99 Tags 484 MiB
055b9c9a46
Commit Graph

10692 Commits

Author SHA1 Message Date
Matthias
37ea6e119e
just center content 2022-04-27 13:21:23 +02:00
Matthias
9c06d3b082
throw out markdown calculatinf 2022-04-27 13:21:10 +02:00
Matthias
6c23c94700
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2301 2022-04-27 13:13:04 +02:00
Matthias
bec2b1d932
make text bigger 2022-04-27 13:12:48 +02:00
Matthias
a02edca2d5
add another spacer 2022-04-27 13:12:22 +02:00
Matthias
f8b974186a
shorten template code 2022-04-27 13:00:45 +02:00
Matthias
2c653504ec
Update logo settings references 2022-04-27 13:00:03 +02:00
Oliver
f98225334e Simplify allocation display for part page 2022-04-27 15:36:44 +10:00
Oliver
481350b138 Refactor available quantity calculation for BOM table 2022-04-27 09:16:57 +10:00
Oliver
2a24fc43e7 Text formatting 2022-04-27 09:07:10 +10:00
Oliver
08ab99adc6 Build order table improvements: 
- Display tick / cross badge for stock availability in build order table
- Correctly order available quantity
 2022-04-27 09:04:57 +10:00
Oliver
01ce571a75
Merge pull request #2877 from matmair/matmair/issue2681 
API Mixin cleanup
 2022-04-27 08:42:10 +10:00
Matthias
d9c0698c34
remove oauth-toolkit 2022-04-26 23:53:07 +02:00
Oliver Walters
340d4d8a89 Launch new forms 2022-04-27 00:12:12 +10:00
Oliver Walters
bf11e8361e Add (empty) callbacks to prefix buttons 2022-04-26 22:18:27 +10:00
Oliver Walters
c66cd1d51b Adds button to expand row for "extra" information 2022-04-26 22:14:01 +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
fec43f126b
Merge pull request #2876 from SchrodingersGat/default-batch-code 
Default batch code
 2022-04-26 20:47:28 +10:00
Oliver Walters
24da5d41b8 Add migration file 2022-04-26 20:21:15 +10:00
Oliver Walters
314cec5ad0 Generate default batch code for stock items 2022-04-26 20:18:33 +10:00
Oliver Walters
3f92f009e4 Add configurable setting for batch code generation 2022-04-26 20:00:06 +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
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
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
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
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
Matthias
1603bf4e60
fix api call 2022-04-26 01:32:31 +02:00
Matthias
e7357726ca
Add oauth for zapier 2022-04-25 11:19:30 +02:00
Matthias
8de35f63be
Add config template section 2022-04-25 01:18:55 +02:00
Matthias
2e4aa8a2fc
Feature request: reverse proxy login support 
Fixes #1693
 2022-04-25 01:18:36 +02: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
Matthias
f06a11e206
fix test 2022-04-24 16:17:47 +02:00
Matthias
cd931af74f
description for config values 2022-04-24 16:15:22 +02:00
Matthias
a4af573812
add logo option to config template 2022-04-24 16:14:55 +02:00
Matthias
1bce7b745e
add custom logo option 2022-04-24 16:13:44 +02:00
Matthias
002f5ec288
move setting lower 2022-04-24 16:12:01 +02:00
Matthias
f1f6c9ff66
remove InvenTree from settings texts 2022-04-24 15:25:34 +02:00
Matthias
2847eef71c
load missing tag 2022-04-24 15:13:31 +02:00
Matthias
f2d0537198
set navbar message via config file 2022-04-24 15:12:03 +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
9673d81014
remove InvenTree name where not needed 2022-04-24 00:23:26 +02:00
Matthias
54d8a4e802
use server title instead of InvenTree 2022-04-24 00:21:33 +02:00
Matthias
7834171c2a
[FR] White labeling 
Fixes #2301
 2022-04-23 23:38:49 +02:00
Matthias Mair
b118890676
Merge branch 'inventree:master' into matmair/issue2694 2022-04-23 21:30:01 +02:00
Matthias Mair
8f13f36e2d
Merge branch 'inventree:master' into matmair/issue2788 2022-04-23 21:29:52 +02: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 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 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
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
Awf Wiswasi
761e822a4e Updated jquery v1.12.1 to v1.13.0 to fix a possible XSS vulnerability. 2022-04-19 17:36:34 -07:00
Matthias Mair
d2e3d824b0
Merge branch 'inventree:master' into plugin-mark-sample 2022-04-20 00:03:42 +02:00
Matthias Mair
544a590b7a
Merge branch 'inventree:master' into plugin-mark-sample 2022-04-19 18:24:21 +02:00
Matthias Mair
3e39f99ccb
Merge branch 'inventree:master' into matmair/issue2788 2022-04-19 18:24:15 +02:00
Matthias Mair
b3dca68c6b
Merge branch 'inventree:master' into matmair/issue2694 2022-04-19 18:24:12 +02:00
Awf Wiswasi
d93cc78bf6 Fixed vulnerability to Cross-site Scripting (XSS) when accepting the value of altField option of the Datepicker widget from untrusted sources, which may lead to execution of untrusted code. Vulnerability fixed in jquery-ui@1.13.0 2022-04-19 05:50:17 -07: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
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
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
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
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
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 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
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
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
Matthias Mair
a6a03acf92
re-add plugin on startup switch 2022-04-14 01:22:09 +02: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 Walters
7276fafcc5 Unit test fix 2022-04-10 20:25:05 +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
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
e225d3b765 Fix action buttons in "part" table on category page 2022-04-07 19:09:43 +10:00
Oliver Walters
e1fbd961e5 Refactor form renderer functions 2022-04-07 19:05:25 +10:00
Oliver Walters
ed69f06620 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-07 18:54:00 +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
eeintech
ad366ef0bd Fix part and po files import 2022-04-06 16:45:23 -04:00
Oliver Walters
e3186b5573 Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity 2022-04-06 18:01:10 +10:00
Oliver
24c64d7479 Bug fix for "inverted" logic when hiding inactive parts from search results 2022-04-06 12:21:19 +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
Oliver
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
Matthias Mair
4ab27e5f3c
Merge branch 'inventree:master' into matmair/issue2694 2022-04-05 02:03:40 +02:00
Matthias Mair
ed60666695
Merge branch 'inventree:master' into matmair/issue2788 2022-04-05 02:03:37 +02:00
Matthias Mair
346327b545
Merge branch 'inventree:master' into plugin-mark-sample 2022-04-05 02:03:29 +02:00
Matthias
bdc62dfcc3
mark active sample code as a sample 2022-04-04 23:53:35 +02: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
Kálmán Rózsahegyi
ade5a81a1a Enhance partStockLabel with ordering/building quantites 2022-04-03 12:36:46 +02:00
Kálmán Rózsahegyi
bc4b66e7d3 Render partStockLabel based on available/in stock quantites 2022-04-03 12:36:37 +02:00
Kálmán Rózsahegyi
d912846e41 Use available quantities in part table, enhance stock badge 2022-04-03 12:35:59 +02:00
Kálmán Rózsahegyi
a9f7457c12 New part table filter on available stock 2022-04-03 12:30:53 +02:00
Oliver
d1d7db76cc
Merge pull request #2797 from SchrodingersGat/available_stock 
Available stock
 2022-04-02 13:52:34 +11:00
Oliver Walters
271cb3f8b1 Rebuild tree structure before running unit tests! 2022-04-02 13:26:39 +11:00
Oliver Walters
fb0b87db3d Further unit test fixes 2022-04-02 12:00:08 +11:00
Oliver Walters
0ab2ff306c Fix incorrect value for "available stock" 2022-04-02 11:13:43 +11:00
Oliver Walters
4593b0f412 Unit test fixes 2022-04-02 11:12:54 +11:00
Oliver Walters
484a0693d7 Check that the sales_order_allocations information is provided in the API endpoint 2022-04-02 10:25:38 +11:00
Oliver Walters
57be4b337d Check that new annotated fields exist in the API dataset 2022-04-02 09:55:37 +11:00
Oliver Walters
f9a0bf822e Add more fixture data 
- Stock items for part 100 (Bob)
 2022-04-02 09:54:55 +11:00
Matthias
07aaa457de
PEP fix 2022-04-02 00:04:25 +02:00
Matthias
66e14b6ad0
move helper function to models.py 2022-04-02 00:01:38 +02:00
Matthias
80fa8f6d18
remove double definition 2022-04-01 23:57:49 +02:00
Matthias
57f9ef75e9
enable all functions for deleted company 2022-04-01 23:55:08 +02:00
Oliver Walters
9ad260e8e0 Bump API version 2022-04-01 17:46:15 +11:00
Oliver Walters
bf6a9b69ce Annotate with "unallocated_stock" quantity (calculated field) 2022-04-01 17:44:05 +11:00
Oliver Walters
94068f6bad Adds annotation for build order allocation count 2022-04-01 17:31:01 +11:00
Oliver Walters
4e100643f5 Add annotation for "allocated_to_sales_orders" 2022-04-01 17:24:15 +11:00
Kálmán Rózsahegyi
6bd5e652ee Fix translation on delete_build form 2022-03-31 15:23:26 +02:00
Oliver
6eab3dbf09
Translation merge (#2792) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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-03-30 15:47:45 +11:00