2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-13 18:45:40 +00:00
Commit Graph

12488 Commits

Author SHA1 Message Date
1dba9f66fb [#2885] Support partial sequences in serial nos ('1, 2, 3+') 2022-04-28 11:24:12 +01:00
8077469a3f [#2885] Support multiple '~' placeholders in serial numbers 2022-04-28 11:23:58 +01:00
e9500e4981 Merge pull request #2892 from SchrodingersGat/build-allocation-fix
Fix part allocation check
2022-04-28 15:21:02 +10:00
aec10e0cc7 Fix part allocation check 2022-04-28 14:58:05 +10:00
5a77156051 Merge pull request #2886 from SchrodingersGat/remove-demo-mode
Remove "demo mode"
2022-04-28 14:13:16 +10:00
823be74f38 PEP fixes 2022-04-28 12:53:16 +10:00
52aaa78bfe Merge pull request #2888 from SchrodingersGat/null-label-fix
Prevent "null" from being displayed as part units
2022-04-28 10:12:06 +10:00
6e7b307423 Prevent "null" from being displayed as part units 2022-04-28 09:51:51 +10:00
4222b614fa Remove stat context variables
(cherry picked from commit 0989c308d0)
2022-04-28 01:21:23 +10:00
110d5f066e I18n merge (#2887)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.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-27 23:58:01 +10:00
d5f503275a Merge pull request #2865 from matmair/matmair/issue1693
Implement proxy based auth
2022-04-27 23:23:17 +10:00
e809fd9a2c Remove database metrics from system info tab 2022-04-27 23:07:26 +10:00
fc3b062188 Mark injected strings as safe 2022-04-27 22:09:25 +10:00
518e0743cb Updated config template 2022-04-27 22:05:25 +10:00
06da120ef3 Hide entry box for changing password 2022-04-27 22:03:55 +10:00
fc4de6c7b8 Remove other demo references 2022-04-27 22:00:58 +10:00
4a843908ec Add customize option to hide admin link in user menu 2022-04-27 21:56:04 +10:00
bb5734d1ef Merge pull request #2861 from matmair/matmair/issue2301
[FR] White labeling
2022-04-27 21:49:15 +10:00
37ea6e119e just center content 2022-04-27 13:21:23 +02:00
9c06d3b082 throw out markdown calculatinf 2022-04-27 13:21:10 +02:00
6c23c94700 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2301 2022-04-27 13:13:04 +02:00
bec2b1d932 make text bigger 2022-04-27 13:12:48 +02:00
a02edca2d5 add another spacer 2022-04-27 13:12:22 +02:00
f8b974186a shorten template code 2022-04-27 13:00:45 +02:00
2c653504ec Update logo settings references 2022-04-27 13:00:03 +02:00
bdf7fd5275 Merge pull request #2882 from SchrodingersGat/allocation-display
Simplify allocation display for part page
2022-04-27 16:02:11 +10:00
f98225334e Simplify allocation display for part page 2022-04-27 15:36:44 +10:00
5144821ba7 Merge pull request #2881 from SchrodingersGat/weasyprint
Add gdk-pixbuf
2022-04-27 14:30:00 +10:00
86f562f3b8 Add gdk-pixbuf
- Required for weasyprint (reports) to render jpg files
2022-04-27 13:46:50 +10:00
4afb07c764 Merge pull request #2880 from SchrodingersGat/build-stock-availability
Visual improvements for build order stock allocation table
2022-04-27 10:18:34 +10:00
481350b138 Refactor available quantity calculation for BOM table 2022-04-27 09:16:57 +10:00
2a24fc43e7 Text formatting 2022-04-27 09:07:10 +10:00
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
01ce571a75 Merge pull request #2877 from matmair/matmair/issue2681
API Mixin cleanup
2022-04-27 08:42:10 +10:00
d9c0698c34 remove oauth-toolkit 2022-04-26 23:53:07 +02:00
fec43f126b Merge pull request #2876 from SchrodingersGat/default-batch-code
Default batch code
2022-04-26 20:47:28 +10:00
e59c0f9d47 Merge pull request #2875 from SchrodingersGat/stock-tab-fix
Re-enable the "pricing" tab
2022-04-26 20:29:26 +10:00
24da5d41b8 Add migration file 2022-04-26 20:21:15 +10:00
314cec5ad0 Generate default batch code for stock items 2022-04-26 20:18:33 +10:00
3f92f009e4 Add configurable setting for batch code generation 2022-04-26 20:00:06 +10:00
0b51ca2902 PEP fixes 2022-04-26 19:54:16 +10:00
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
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
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
89b8d04ca4 Merge pull request #2833 from SchrodingersGat/variant-available
Add 'available_variant_stock' to BomItem serializer
2022-04-26 18:47:56 +10:00
3ef0386593 Prevent inactive or trackable parts from being 'auto allocated' 2022-04-26 17:14:47 +10:00
ee47be4c9e Add unit test for 'available_variant_stock' in BomItem API serializer 2022-04-26 17:05:21 +10:00
7aaa4a5812 add unit tests for new variant_stock annotations 2022-04-26 16:39:03 +10:00
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
d4fc4bb8bd Merge branch 'master' into variant-available
# Conflicts:
#	InvenTree/InvenTree/api_version.py
2022-04-26 16:21:53 +10:00