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,733 Commits 9 Branches 164 Tags
4e7d1d8e7f6ac8ccccd725d2511aab0e65e720fc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 4e7d1d8e7f Bump API version 2022-05-04 15:16:50 +10:00
Oliver Walters 62cd0f39c7 Replace the existing CancelPurchaseOrderForm with an API driven form 2022-05-04 15:14:14 +10:00
Oliver Walters e920fc31e7 Only include extra context information if requested 2022-05-04 15:07:22 +10:00
Oliver Walters c7980a347e Adds ability to add custom serializer context information to the OPTIONS endpoint 
- Will be useful for constructing prettier forms with information about the endpoint
 2022-05-04 15:06:02 +10:00
OliverandGitHub dbc0023c57 Update CONTRIBUTING.md 
Update labels a bit
 2022-05-04 12:10:00 +10:00
OliverandGitHub 1e4cf346e3 Merge pull request #2922 from matmair/doc-update 
Clean up tags
 2022-05-04 11:53:47 +10:00
OliverandGitHub 628c9edd09 Merge pull request #2929 from SchrodingersGat/spelling-fixes 
Fix speling errors in translated strings
 2022-05-04 09:56:47 +10:00
OliverandGitHub b65a969433 Merge pull request #2928 from matmair/coverage-adaption 
Increase coverage
 2022-05-04 09:39:24 +10:00
Oliver Walters 75e24635b5 Fix speling errors in translated strings 2022-05-04 09:17:42 +10:00
OliverandGitHub a191e45511 Merge pull request #2927 from SchrodingersGat/order-parts-wizard 
Order parts wizard
 2022-05-03 18:36:45 +10:00
Oliver Walters e7ddeb8173 PEP style fixes 2022-05-03 17:36:30 +10:00
Oliver Walters 96c5a8252c remove dead code 2022-05-03 17:33:03 +10:00
Oliver Walters f0e8e32c8a More refactoring 2022-05-03 17:27:21 +10:00
Oliver Walters f3e8edaf1f Refactor for SupplierPart detail page 2022-05-03 17:21:33 +10:00
Oliver Walters 05b01e4d6c Refactor order parts for manfuacturer part detail page 2022-05-03 17:16:38 +10:00
Oliver Walters 28f3244574 Order parts from "supplier parts" page 
- Prevent duplicate parts from loading
 2022-05-03 16:52:23 +10:00
Oliver Walters c0163a476f Refactor 'order parts' window from manufacturer part list 2022-05-03 16:42:00 +10:00
OliverandGitHub 1158b81b8b Merge pull request #2926 from SchrodingersGat/event-generation 
Use the tablename when generating automatic model events
 2022-05-03 15:38:31 +10:00
OliverandGitHub e938870b32 Merge pull request #2770 from SchrodingersGat/order-parts-wizard 
Order parts wizard
 2022-05-03 14:56:53 +10:00
Oliver Walters bac5a16491 JS linting fxies 2022-05-03 14:28:41 +10:00
Oliver Walters 141b764b94 Modal fixes 2022-05-03 14:01:25 +10:00
Oliver Walters 8cd8581dbf fixes 2022-05-03 13:51:04 +10:00
Oliver Walters 1794f65d19 Button to submit each row individually 2022-05-03 13:44:28 +10:00
Oliver Walters d69b5811b1 Improved javascript log / warn / error messages 2022-05-03 12:00:28 +10:00
Oliver Walters 4732efb330 Fix callbacks for adding new supplier part and/or purchase order "inline" 2022-05-03 11:42:13 +10:00
Oliver Walters 40c9885b87 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-05-03 10:32:47 +10:00
Oliver Walters f1d8bf71b7 Use the tablename when generating automatic model events 2022-05-03 10:18:11 +10:00
OliverandGitHub 972cff493e Merge pull request #2917 from matmair/new-readme 
Add new readme
 2022-05-03 09:26:48 +10:00
Oliver Walters e87a02638e Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/order/serializers.py
#	InvenTree/templates/js/translated/model_renderers.js
 2022-05-02 16:11:11 +10:00
OliverandGitHub 41177f8611 Merge pull request #2918 from SchrodingersGat/translation-adjustment 
Translation adjustment
 2022-05-02 11:25:56 +10:00
OliverandGitHub 4d7eda2572 Merge pull request #2919 from SchrodingersGat/import-delete 
Adds option to delete existing data when importing records
 2022-05-02 11:18:29 +10:00
Oliver Walters d49763bd25 Adjust translation compilation step performed as part of "invoke update" 2022-05-02 10:53:43 +10:00
Oliver Walters 18080f329b Remove compiled .mo files from tracking 2022-05-02 10:52:30 +10:00
Oliver Walters cfb523adec Adds option to delete existing data when importing records 2022-05-02 10:45:26 +10:00
OliverandGitHub 422e22b8e6 Merge pull request #2916 from SchrodingersGat/use-the-force 
Force push translation files
 2022-05-02 10:38:42 +10:00
OliverGitHubgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 		194d72e63e updated translation base (#2914) 
* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2022-05-02 10:31:31 +10:00
Oliver Walters 36da363188 Force push translation files 2022-05-02 09:37:33 +10:00
OliverandGitHub ef52be82d9 Merge pull request #2913 from matmair/codebase-cleanup 
Codebase cleanup to python 3.9 / django 3.2
 2022-05-02 09:25:52 +10:00
OliverandGitHub b59a4d53f0 Merge pull request #2911 from SchrodingersGat/translation-ci 
Fix CI
 2022-05-01 23:51:22 +10:00
Oliver Walters 8635cb8267 Fix CI 2022-05-01 23:21:49 +10:00
OliverandGitHub cc42977233 Merge pull request #2910 from SchrodingersGat/translation-ci 
Translation CI
 2022-05-01 23:19:58 +10:00
OliverandGitHub 2927835a7d Merge pull request #2909 from SchrodingersGat/settings-bug-fixes 
Settings bug fixes
 2022-05-01 23:17:28 +10:00
Oliver Walters 526571c062 Prevent recursion 2022-05-01 22:50:56 +10:00
Oliver Walters e3c3ed28da PEP fixes 2022-05-01 22:46:50 +10:00
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
Oliver Walters d72efc3757 Small tweaks 
- Factor out native_value property (not needed!)
- PEP fixes
 2022-05-01 22:30:24 +10:00
Oliver Walters f794d91e5c Adds more unit tests for global settings objects 2022-05-01 22:26:51 +10:00
Oliver Walters 0f8f9f3e5e Add unit test for integer settings with validator 2022-05-01 22:21:57 +10:00
Oliver Walters f972551246 Add unit test for multiple-choice setting type 2022-05-01 22:07:16 +10:00
Oliver Walters eabe082f0a Add unit tests for boolean user settings (via the API) 2022-05-01 20:23:50 +10:00
Oliver Walters 75fa0bed26 Render "native value" in serializer 2022-05-01 20:13:58 +10:00
Oliver Walters 5d4972d981 Convert settings to 'native' values before running callable valiators 2022-05-01 19:46:17 +10:00
Oliver Walters 3777686c92 503 page was missing inventree_extras 
(cherry picked from commit 1a8fd7878ea253f7cdfd50f54850827e634fcb0f)
 2022-05-01 19:44:52 +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