2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-14 11:05:41 +00:00
Commit Graph

9886 Commits

Author SHA1 Message Date
31a8ee7302 Merge branch 'inventree:master' into plugin-2037 2021-10-20 23:52:51 +02:00
48edaa9e2a not all test be fixed 2021-10-20 23:05:45 +02:00
d29e548c05 fix test 2021-10-20 22:38:55 +02:00
ae086ba6d4 rename 2021-10-20 22:17:10 +02:00
a5a346e28b Merge branch 'plugin-2037' of https://github.com/matmair/InvenTree into plugin-2037 2021-10-20 22:13:49 +02:00
593c7a41de refactor fnc name 2021-10-20 22:09:50 +02:00
c6a5a44355 format results as HTTP result 2021-10-20 22:07:29 +02:00
a03c560914 refactor result processing 2021-10-20 22:06:32 +02:00
1b72dfeae6 fix header safeing 2021-10-20 22:04:36 +02:00
5571cfdbdb Merge pull request #2184 from SchrodingersGat/allocation-fixes
Sales order allocation fix
2021-10-20 23:53:59 +11:00
50a79770e5 Un-comment lines in build.serializers 2021-10-20 23:37:26 +11:00
f83dc134ef linting 2021-10-20 23:20:43 +11:00
8805b0a553 Add similar auto field capabilities to build order 2021-10-20 23:14:52 +11:00
92568748cf Further improvements
- Add callback for when a select2 form field is updated
- Adjust selected quantity based on returned data
- auto_fill the stock_item field
2021-10-20 23:03:03 +11:00
f7b6c68237 Pre-fill the form with the remaining allocation quantity 2021-10-20 22:37:54 +11:00
592c5f0d6c Delete .gitmodules 2021-10-19 21:44:42 +02:00
24a8c34699 only check if plugin urls are enabled if db ready 2021-10-19 21:42:29 +02:00
1c93a126ae Revert "remove url load setting for plugin"
This reverts commit e37477eb15.
2021-10-19 21:39:58 +02:00
f86bd4dd6b catch db not loaded 2021-10-19 20:59:14 +02:00
23558e235b PEP fix 2021-10-19 20:58:35 +02:00
e37477eb15 remove url load setting for plugin 2021-10-19 19:54:20 +02:00
9fe1dd7be4 Merge pull request #2180 from SchrodingersGat/build-fix
Fix for rendering of build order page
2021-10-19 22:00:09 +11:00
c75586bd9a Fix for rendering of build order page 2021-10-19 21:36:51 +11:00
f31b8a6e99 Merge pull request #2179 from SchrodingersGat/settings-page-candy
Settings page candy
2021-10-19 12:17:32 +11:00
60771a74a4 "InvenTree Settings" > "Global Settings" 2021-10-19 11:00:32 +11:00
a3b3bdc88b Add some more icons to the settings page 2021-10-19 10:59:52 +11:00
69ee4ea14f and here is the helper 2021-10-19 00:32:51 +02:00
bf679f185f always escalete object 2021-10-19 00:32:26 +02:00
515e1faad4 return json rsponse on webhooks 2021-10-19 00:31:25 +02:00
049f5c7fe1 Merge pull request #2178 from SchrodingersGat/home-page-improvements
UI tweaks
2021-10-19 09:08:45 +11:00
6147b079d1 safe url loading 2021-10-18 23:03:00 +02:00
b36a1d47e1 move webhook receiver logic 2021-10-18 22:39:08 +02:00
4de3bed342 UI tweaks 2021-10-18 22:19:54 +11:00
860cf46cb0 Merge pull request #2177 from SchrodingersGat/quick-search
Add a per-user setting to enable display of stock in search results
2021-10-18 16:57:34 +11:00
5802a27fe7 Add a per-user setting to enable display of stock in search results 2021-10-18 16:23:42 +11:00
ddeab64072 Merge pull request #2176 from SchrodingersGat/quick-search
Display stock level in quick search bar
2021-10-18 16:13:48 +11:00
4bb0b725da JS cleanup 2021-10-18 15:51:50 +11:00
ce921a6774 Display stock level in quick search bar 2021-10-18 15:40:00 +11:00
03726911e1 Merge pull request #2175 from SchrodingersGat/grid-view
Improvements to "grid view" for parts list
2021-10-18 13:00:28 +11:00
4b344cd7bb CSS tweaks 2021-10-18 12:36:42 +11:00
68cfd8615e Improvements to "grid view" for parts list
- Display 5 tiles per line
- Reduce padding
- Add border
2021-10-18 12:19:16 +11:00
addb265984 Merge pull request #2159 from SchrodingersGat/build-output-complete
Build output improvements
2021-10-18 09:16:21 +11:00
e04dfa0681 Unit test fix 2021-10-18 08:58:04 +11:00
20bb2d438e make settings protectable from output 2021-10-17 23:19:27 +02:00
5eb26c84b9 remove unneeded migration 2021-10-17 20:38:52 +02:00
c2535cbcd7 PEP fix 2021-10-17 19:59:02 +02:00
11672096e7 always check if app already loaded 2021-10-17 19:57:42 +02:00
d577d3778d PEP fix 2021-10-17 19:53:11 +02:00
dcab0c430c testing safe settings and app integration 2021-10-17 19:50:46 +02:00
5dd36c7587 testing safe url checks 2021-10-17 19:50:21 +02:00