inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
12,629 Commits 9 Branches 164 Tags
9e469a949f5d27cff3a7e6a1d991344e0f84aa80
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 9e469a949f Push from latest master to l10 branch 2022-05-01 22:43:25 +10:00
Oliver Walters 8abc96a79a Ignore .mo files 2022-05-01 22:42:25 +10:00
Oliver Walters ef530956a8 Run translation as part of the update process 2022-05-01 22:38:18 +10:00
Oliver Walters 0a3613476c Fix empty translation string 2022-05-01 22:34:03 +10:00
OliverandGitHub 433ecdb2c3 Merge pull request #2714 from matmair/matmair/issue2694 
[FR] Add delivery cost (excluding unit cost that already exists) in PO
 2022-05-01 10:28:47 +10:00
OliverandGitHub 937232a238 Merge pull request #2904 from matmair/patch-1 
Adding permissions to hook
 2022-05-01 10:03:19 +10:00
OliverandGitHub 6497dd7d31 Merge pull request #2779 from rkalman/feat-qr-scanner 
Camera QR scanner
 2022-05-01 09:56:05 +10:00
OliverandGitHub d7e9e15c21 Merge pull request #2901 from SchrodingersGat/multi-bom-fix 
Refactor BOM table to not load multi level BOMs by default
 2022-04-29 17:57:33 +10:00
Oliver 35de490f72 JS linting fixes 2022-04-29 17:13:59 +10:00
Oliver 260680c5c4 Refactor BOM table to not load multi level BOMs by default 
- Click to select which ones to load
 2022-04-29 17:07:54 +10:00
OliverandGitHub 227b3d6aec Merge pull request #2893 from SchrodingersGat/build-output-table-improvements 
Build output table improvements
 2022-04-29 15:05:52 +10:00
Oliver 1bb2551edb Fixes for model rendering code 2022-04-29 13:51:49 +10:00
Oliver 94fa424440 Table tweaks 2022-04-29 13:13:12 +10:00
Oliver a80465e85c Display batch code in build output table 2022-04-29 13:03:41 +10:00
Oliver 8fc34a21a6 Reload the untracked stock table when allocation actions are performed 2022-04-29 12:59:20 +10:00
Oliver Walters 51da1f02a8 JS linting fixes 2022-04-29 01:58:57 +10:00
Oliver Walters b595fa0e7e Fix loading of untracked parts table 2022-04-29 01:40:59 +10:00
Oliver Walters 0bda9c974e PEP fixes 2022-04-29 01:35:09 +10:00
Oliver Walters a0ca20ab04 Retrieve all stock item test results at once 2022-04-29 01:27:58 +10:00
Oliver Walters e0189be5a6 Adds ability to filter StockItemTestresult API list by Build ID 
- Allows us to retrieve stock item test results in a single API query
 2022-04-29 01:19:36 +10:00
Oliver Walters 6b4592b3dc Display error if stock item is "double allocted" 2022-04-29 01:10:05 +10:00
Oliver Walters 81638d06cf Show or hide items based on output BOM 2022-04-29 00:51:56 +10:00
Oliver Walters 6e52ca2178 Refactor button callbacks 
- Add button to expand all output rows
- Add button to collapse all output rows
 2022-04-29 00:44:29 +10:00
Oliver Walters 3da6446373 Allow sorting of build output table by allocated items 2022-04-29 00:32:33 +10:00
Oliver Walters 6c6ebe70c2 Update progress bars for build output allocation 2022-04-29 00:27:27 +10:00
Oliver Walters df9a33935d Row button fixes 2022-04-28 23:26:08 +10:00
Oliver Walters 4a81c058d6 Function to reload allocation table data 2022-04-28 23:14:37 +10:00
Oliver Walters cb7c4396fb Refactor build page template 
- Only load build outputs table as required
 2022-04-28 22:59:24 +10:00
Oliver Walters b63352ce20 Add a stock item transaction when installing items into a build output 2022-04-28 22:58:58 +10:00
OliverandGitHub cd0de941ac Merge pull request #2895 from exp/issue-2885 
Issue 2885 - Support more serial number formats and fix a couple of bugs
 2022-04-28 22:04:00 +10:00
Oliver Walters f531e354b9 Allow completion of partially allocated build outputs 
- Requires manual acceptance from user
 2022-04-28 21:54:38 +10:00
Oliver 72bcea2f6d Better caching and rendering of sub tables for particular build outputs 2022-04-28 17:53:27 +10:00
Oliver b8f274c680 Request allocations for entire build, and cache 2022-04-28 17:38:08 +10:00
Oliver 0841c628e0 Adds ability to filter build items by "tracked" flag 2022-04-28 17:27:09 +10:00
Oliver e6c95bf6b2 Cache tracked BOM items for the build order 2022-04-28 17:08:43 +10:00
Oliver 74a08be5be Load (and cache) tracked BOM items for this build output 2022-04-28 17:00:23 +10:00
Oliver a48c802576 Sort by test status 2022-04-28 16:54:29 +10:00
Oliver d894302e62 Request build output test result information 2022-04-28 16:54:02 +10:00
Oliver 6538ab86cb Bug fix for 'required' filter in PartTestTemplate API 2022-04-28 16:25:04 +10:00
Oliver 2b46ed300e Client side pagination and sorting 2022-04-28 16:18:40 +10:00
Oliver 63145c90b0 Server-side sorting of "build output" column 2022-04-28 16:14:23 +10:00
Oliver ba3bcdba89 Add switchable columns to build output table 2022-04-28 15:50:10 +10:00
OliverandGitHub e9500e4981 Merge pull request #2892 from SchrodingersGat/build-allocation-fix 
Fix part allocation check
 2022-04-28 15:21:02 +10:00
Oliver aec10e0cc7 Fix part allocation check 2022-04-28 14:58:05 +10:00
OliverandGitHub 5a77156051 Merge pull request #2886 from SchrodingersGat/remove-demo-mode 
Remove "demo mode"
 2022-04-28 14:13:16 +10:00
Oliver 823be74f38 PEP fixes 2022-04-28 12:53:16 +10:00
OliverandGitHub 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
Oliver 6e7b307423 Prevent "null" from being displayed as part units 2022-04-28 09:51:51 +10:00
Oliver Walters 4222b614fa Remove stat context variables 
(cherry picked from commit 0989c308d0)
 2022-04-28 01:21:23 +10:00
OliverandGitHub 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
OliverandGitHub d5f503275a Merge pull request #2865 from matmair/matmair/issue1693 
Implement proxy based auth
 2022-04-27 23:23:17 +10:00
Oliver Walters e809fd9a2c Remove database metrics from system info tab 2022-04-27 23:07:26 +10:00
Oliver Walters fc3b062188 Mark injected strings as safe 2022-04-27 22:09:25 +10:00
Oliver Walters 518e0743cb Updated config template 2022-04-27 22:05:25 +10:00
Oliver Walters 06da120ef3 Hide entry box for changing password 2022-04-27 22:03:55 +10:00
Oliver Walters fc4de6c7b8 Remove other demo references 2022-04-27 22:00:58 +10:00
Oliver Walters 4a843908ec Add customize option to hide admin link in user menu 2022-04-27 21:56:04 +10:00
OliverandGitHub bb5734d1ef Merge pull request #2861 from matmair/matmair/issue2301 
[FR] White labeling
 2022-04-27 21:49:15 +10:00
OliverandGitHub bdf7fd5275 Merge pull request #2882 from SchrodingersGat/allocation-display 
Simplify allocation display for part page
 2022-04-27 16:02:11 +10:00
Oliver f98225334e Simplify allocation display for part page 2022-04-27 15:36:44 +10:00
OliverandGitHub 5144821ba7 Merge pull request #2881 from SchrodingersGat/weasyprint 
Add gdk-pixbuf
 2022-04-27 14:30:00 +10:00
Oliver 86f562f3b8 Add gdk-pixbuf 
- Required for weasyprint (reports) to render jpg files
 2022-04-27 13:46:50 +10:00
OliverandGitHub 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
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
OliverandGitHub 01ce571a75 Merge pull request #2877 from matmair/matmair/issue2681 
API Mixin cleanup
 2022-04-27 08:42:10 +10:00
OliverandGitHub fec43f126b Merge pull request #2876 from SchrodingersGat/default-batch-code 
Default batch code
 2022-04-26 20:47:28 +10:00
OliverandGitHub e59c0f9d47 Merge pull request #2875 from SchrodingersGat/stock-tab-fix 
Re-enable the "pricing" tab
 2022-04-26 20:29:26 +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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub c743ededf4 Merge pull request #2873 from SchrodingersGat/build-auto-allocate-fix 
Fix for 'auto-allocate' stock to build orders
 2022-04-26 16:24:34 +10:00
Oliver 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
OliverandGitHub 2696f6bfbd Merge pull request #2869 from SchrodingersGat/ipn-validator-fix 
Adds 'variant_of' filter back into Part API
 2022-04-26 12:05:30 +10:00
Oliver 70d4960fa3 Add new unit tests for part API filters 2022-04-26 11:43:34 +10:00
OliverandGitHub 61a56be114 Merge pull request #2870 from SchrodingersGat/pt-br 
pt-br
 2022-04-26 11:40:46 +10:00
Oliver c705bb57c6 Fix language code 2022-04-26 11:16:55 +10:00
Oliver 64b1f56b98 Generate pt_br 2022-04-26 11:09:21 +10:00
Oliver b5551a1ceb Adds pt_br (brazillian) 2022-04-26 11:05:40 +10:00
Oliver 693e47ab89 Remove outdated filter_fields variable 2022-04-26 11:02:22 +10:00
Oliver e1e0432963 Adds 'variant_of' filter back into Part API 2022-04-26 10:57:43 +10:00
OliverandGitHub 7ae9586c82 Merge pull request #2864 from matmair/remove-dead-code 
Remove dead code
 2022-04-25 08:55:21 +10:00
OliverandGitHub adfcd42e09 Merge pull request #2859 from SchrodingersGat/ipn-validator-fix 
IPN validator fix
 2022-04-22 15:11:33 +10:00
Oliver 99718865c0 Further attempts to fix CI issues 2022-04-22 14:33:46 +10:00
Oliver 4994920119 Use recommended collation option 2022-04-22 13:48:15 +10:00
Oliver fa3c24b085 Try a different collation option 2022-04-22 13:25:22 +10:00
Oliver 0806e18aca Case sensitive collation 2022-04-22 12:39:42 +10:00
Oliver 2f1e869351 Only set collation option for mysql test database 2022-04-22 11:31:51 +10:00
Oliver dc0f18d21f Specify charset and collation options for the test database 2022-04-22 11:20:49 +10:00
Oliver Walters 5fde9f552c Add similar check for IPN 2022-04-22 01:00:38 +10:00