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

10343 Commits

Author SHA1 Message Date
f5fa64d9a9 Merge branch 'inventree:master' into plugin-2037 2021-11-04 23:42:07 +01:00
46fc1e19d5 Merge pull request #2254 from SchrodingersGat/docker-stable
Target production docker-compose script to inventree:stable
2021-11-05 08:15:49 +11:00
ab3acc4601 Target production docker-compose script to inventree:stable 2021-11-05 07:52:15 +11:00
083967b156 Merge pull request #2198 from SchrodingersGat/stock-item-forms
Stock item forms
2021-11-05 07:37:33 +11:00
f49800d5b8 make attr - test safer 2021-11-04 14:54:15 +01:00
185924e1f8 More linting 2021-11-05 00:35:47 +11:00
5a0ff4c077 JS linting 2021-11-05 00:32:11 +11:00
78ac40083a Fixes for stock api unit tests
- Remove old unit tests
- Require quantity when creating a new stock item
2021-11-05 00:27:26 +11:00
1ac51afd27 revert unneeded change 2021-11-04 14:23:42 +01:00
0daba629fe Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 14:23:17 +01:00
2992dfdfed remove Shopify 2021-11-04 14:21:17 +01:00
f27acde934 More fixes
- Allow stock item creation for inactive parts
- Better handling of successful stock item creation
- Disable fields rather than hiding them
2021-11-05 00:02:55 +11:00
80414ba6b5 make icon optional 2021-11-04 13:44:25 +01:00
267c5ca40c show install method for plugin 2021-11-04 13:30:40 +01:00
99c3bc5529 make package info conditional 2021-11-04 13:21:02 +01:00
41954fd2d6 make naming less git related 2021-11-04 13:19:08 +01:00
b41dbba2b0 Correctly handle serialization of newly created stock 2021-11-04 23:18:59 +11:00
3be4acf3ef More refactoring for notifications
- Adds default behaviour for successful stock item creation
2021-11-04 23:09:49 +11:00
2fc8efbfb2 simplify syntax 2021-11-04 13:08:30 +01:00
285e6fe93e prepare fnc for loading metadata 2021-11-04 13:07:35 +01:00
ce30b852e7 Merge pull request #2252 from SchrodingersGat/hide-inactive
Add option to hide inactive parts in search preview window
2021-11-04 23:06:54 +11:00
dd61714435 refactor 2021-11-04 13:04:02 +01:00
c085a86891 naming refactor 2021-11-04 12:55:39 +01:00
cb30188623 fix commit references 2021-11-04 12:49:19 +01:00
97326d9fb2 Display stock item owner (if applicable) 2021-11-04 22:45:11 +11:00
e654ba786f decide where transit info is loaded from based on install method 2021-11-04 12:43:27 +01:00
50e5bfc4a4 flag if plugin was packaged 2021-11-04 12:42:22 +01:00
b65f950864 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 22:40:09 +11:00
71bb6fff50 Add option to hide inactive parts in search preview window 2021-11-04 22:25:35 +11:00
e12e93f19e merge migrations 2021-11-04 10:27:40 +01:00
b54f9c9c13 provide backport for 3.7 2021-11-04 10:24:05 +01:00
a88f144239 merge fixes 2021-11-04 10:17:39 +01:00
eea6c8675c PEP fix 2021-11-04 10:12:30 +01:00
363f21d6d7 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 10:10:58 +01:00
ceba5b7312 Merge pull request #2249 from SchrodingersGat/search-dropdown-fix
Fixes for search auto-complete dropdown menu
2021-11-04 17:26:12 +11:00
f0e44f0efd Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 17:24:30 +11:00
76b5bc067a Fix notes field 2021-11-04 17:06:52 +11:00
3ceb6f6ba8 Fix barcode input 2021-11-04 17:04:47 +11:00
b1598cfd10 - style fixes
- add part description as mouse-over text
2021-11-04 17:02:52 +11:00
2130b02e7f Merge pull request #2193 from matmair/matmair/issue2181
Add missing part import fields
2021-11-04 16:54:30 +11:00
345bccb9bc Merge pull request #2248 from SchrodingersGat/email-fixes
Fixes for low-stock emails
2021-11-04 16:48:28 +11:00
9cfcb6579f Fixes for search auto-complete dropdown menu
- Fix rendering of badges
- Menu fills out right-to-left
2021-11-04 16:48:24 +11:00
39d3a127e1 Template improvements 2021-11-04 16:19:57 +11:00
3a7f8c9196 Fix comparison operator 2021-11-04 16:18:49 +11:00
75d7530e30 Fix missing tag in template 2021-11-04 16:17:05 +11:00
5ae6241083 Fixes for low-stock emails
- Include variant stock in test
- Improve email template
2021-11-04 16:15:11 +11:00
3b052e6bce Merge pull request #2247 from SchrodingersGat/tree-view-fixes
Fix for tree-view
2021-11-04 15:30:07 +11:00
170d8d11d3 Merge pull request #2246 from SchrodingersGat/build-order-notification
Build order notification
2021-11-04 15:23:39 +11:00
47f6a8266d Fix for tree-view
- Force "cascade" to be set
2021-11-04 15:08:22 +11:00
42a794e8e4 Fix CI errors 2021-11-04 15:05:54 +11:00