inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity
14,376 Commits 6 Branches 136 Tags
4c3dc6ddbd677e1f0d3e45294d7fbff96df7c3bb
Commit Graph

14376 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver
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
Oliver
937232a238 Merge pull request #2904 from matmair/patch-1 
Adding permissions to hook
 2022-05-01 10:03:19 +10:00
Oliver
6497dd7d31 Merge pull request #2779 from rkalman/feat-qr-scanner 
Camera QR scanner
 2022-05-01 09:56:05 +10:00
Matthias
93a05491ce PEP fix 2022-05-01 00:17:07 +02:00
Matthias
58901a8cf6 fix migrations 2022-05-01 00:15:02 +02:00
Matthias
0c72fa180c fix model backtrack 2022-05-01 00:09:17 +02:00
Matthias
9947cc2b08 remove old permissionset 2022-05-01 00:07:37 +02:00
Matthias
132f4aa82e Use set_null instead 2022-05-01 00:07:13 +02:00
Kálmán Rózsahegyi
b8399e4887 Increment number of JS files in test_js_load 2022-04-30 21:56:05 +02:00
Kálmán Rózsahegyi
c7692475a8 Add onBarcodeScanClicked() to exported functions 2022-04-30 21:28:55 +02:00
Matthias Mair
b1019abb45 adding permissions to hook 
see https://github.com/inventree/InvenTree/pull/2895#issuecomment-1112733654
 2022-04-30 20:01:30 +02:00
Matthias Mair
c18579088a Merge branch 'inventree:master' into matmair/issue2385 2022-04-30 19:53:32 +02:00
Matthias Mair
71a0d8159e Merge branch 'inventree:master' into matmair/issue2788 2022-04-30 19:53:10 +02:00
Matthias Mair
e75daec695 Merge branch 'inventree:master' into matmair/issue2694 2022-04-30 19:50:25 +02:00
Kálmán Rózsahegyi
84bfb0a827 One more try to pass JS checks... 2022-04-30 12:33:44 +02:00
Kálmán Rózsahegyi
51152eee53 More JS style fixes 2022-04-30 12:22:10 +02:00
Kálmán Rózsahegyi
b37bb3eb3e Fix JS styling 2022-04-30 12:14:13 +02:00
Kálmán Rózsahegyi
8b279edee0 Merge branch 'master' into feat-qr-scanner 2022-04-30 11:57:09 +02:00
Oliver
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
Oliver
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
Kalman Rozsahegyi
32febb010c Fix a wrong merge in requirements.txt 2022-04-28 22:15:11 +02:00
Kalman Rozsahegyi
9e1a143132 Merge branch 'master' into feat-qr-scanner 2022-04-28 22:14:11 +02:00
Kalman Rozsahegyi
5b5a39568b Merge branch 'master' into feat-qr-scanner 2022-04-28 22:09:01 +02: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