Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,296 Commits 6 Branches 99 Tags 484 MiB
61f6061edf
Commit Graph

8612 Commits

Author SHA1 Message Date
Matthias
285e6fe93e
prepare fnc for loading metadata 2021-11-04 13:07:35 +01:00
Matthias
dd61714435
refactor 2021-11-04 13:04:02 +01:00
Matthias
c085a86891
naming refactor 2021-11-04 12:55:39 +01:00
Matthias
cb30188623
fix commit references 2021-11-04 12:49:19 +01:00
Oliver
97326d9fb2 Display stock item owner (if applicable) 2021-11-04 22:45:11 +11:00
Matthias
e654ba786f
decide where transit info is loaded from based on install method 2021-11-04 12:43:27 +01:00
Matthias
50e5bfc4a4
flag if plugin was packaged 2021-11-04 12:42:22 +01:00
Oliver
b65f950864 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 22:40:09 +11:00
Oliver
71bb6fff50 Add option to hide inactive parts in search preview window 2021-11-04 22:25:35 +11:00
Matthias
e12e93f19e
merge migrations 2021-11-04 10:27:40 +01:00
Matthias
b54f9c9c13
provide backport for 3.7 2021-11-04 10:24:05 +01:00
Matthias
a88f144239
merge fixes 2021-11-04 10:17:39 +01:00
Matthias
eea6c8675c
PEP fix 2021-11-04 10:12:30 +01:00
Matthias
363f21d6d7
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 10:10:58 +01:00
Oliver
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
Oliver
f0e44f0efd Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 17:24:30 +11:00
Oliver
76b5bc067a Fix notes field 2021-11-04 17:06:52 +11:00
Oliver
3ceb6f6ba8 Fix barcode input 2021-11-04 17:04:47 +11:00
Oliver
b1598cfd10 - style fixes 
- add part description as mouse-over text
 2021-11-04 17:02:52 +11:00
Oliver
2130b02e7f
Merge pull request #2193 from matmair/matmair/issue2181 
Add missing part import fields
 2021-11-04 16:54:30 +11:00
Oliver
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
Oliver
39d3a127e1 Template improvements 2021-11-04 16:19:57 +11:00
Oliver
3a7f8c9196 Fix comparison operator 2021-11-04 16:18:49 +11:00
Oliver
75d7530e30 Fix missing tag in template 2021-11-04 16:17:05 +11:00
Oliver
5ae6241083 Fixes for low-stock emails 
- Include variant stock in test
- Improve email template
 2021-11-04 16:15:11 +11:00
Oliver
3b052e6bce
Merge pull request #2247 from SchrodingersGat/tree-view-fixes 
Fix for tree-view
 2021-11-04 15:30:07 +11:00
Oliver
170d8d11d3
Merge pull request #2246 from SchrodingersGat/build-order-notification 
Build order notification
 2021-11-04 15:23:39 +11:00
Oliver
47f6a8266d Fix for tree-view 
- Force "cascade" to be set
 2021-11-04 15:08:22 +11:00
Oliver
42a794e8e4 Fix CI errors 2021-11-04 15:05:54 +11:00
Oliver
01191d84c5 Only run check stock function when updating an existing part 2021-11-04 14:32:42 +11:00
Oliver
99b324d1ef Add a post-save hook the "Build" model to check stock 2021-11-04 14:30:23 +11:00
Matthias
cf0c8ec2ea
remove builtin integrations 2021-11-04 03:44:48 +01:00
Matthias
7fbf25840f
fix problem with iso format dates 2021-11-04 03:44:30 +01:00
Matthias
93a28bbaba
enable setup hooks 
Fixes #2218
 2021-11-04 03:43:39 +01:00
Oliver
6db6a70fc2 Add task to check required stock for build order 2021-11-04 13:32:14 +11:00
Oliver
9dba3c3f10 Refactored bom export 2021-11-04 12:10:36 +11:00
Oliver
be543ca3da Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 10:57:40 +11:00
Oliver
3b56895f4d Merge branch 'master' into stock-item-forms 2021-11-04 10:34:49 +11:00
Oliver
b279317f89 Button style fixes 2021-11-04 10:24:47 +11:00
Oliver
4118f98d4d Display more errors 2021-11-04 10:17:38 +11:00
Oliver
b6d48cab2a Make further use of notification messages 2021-11-04 10:14:01 +11:00
Oliver
df30a85c03 More fixes: 
- Add "back to site" button on logout screen
- Add favicon to account pages
- Refactor notifications / alerts / caching
 2021-11-04 09:59:56 +11:00
Oliver
4e7825df13 Fix javascript issues on login screens 2021-11-04 09:26:32 +11:00
Oliver
d4a8f5823c Fix for missing template file 2021-11-04 09:13:13 +11:00
Oliver
52242e7a00 Catch error 2021-11-04 08:40:38 +11:00
Matthias
83d0693013
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-03 21:25:04 +01:00
Oliver
3a61d11f5a Adds a scheduled task to remove old notification entries from the database 2021-11-04 01:33:26 +11:00
Oliver
6c724556f1 PEP fixes 2021-11-04 01:21:08 +11:00
Oliver
a447e22108 Prevent low-stock notifications from overwhelming users 
- Limit to once per day, per part
 2021-11-04 01:18:00 +11:00
Oliver
bebf368d06 Add functionality and unit testing for new model 2021-11-04 01:11:42 +11:00
Oliver
1f7676ee65 Add admin entry for new model 2021-11-04 01:06:57 +11:00
Oliver
e7b93a54d8 Add new model "NotificationEntry" 
- Keep track of past notifications
 2021-11-04 00:55:43 +11:00
Oliver
ef2307aeaa Add new model to permissions table 2021-11-04 00:46:23 +11:00
Oliver
5542532223 Template tweaks 2021-11-04 00:44:16 +11:00
Oliver
ee7c3ae066 Update index page 2021-11-04 00:38:34 +11:00
Oliver
476a1342c1 Improve notification of 'low stock' parts: 
- Traverse up the variant tree
- Enable subscription by "category"
 2021-11-04 00:28:10 +11:00
Oliver
1c6eb41341 Ability to toggle part category "star" status via the API 2021-11-04 00:01:52 +11:00
Oliver
193d6b334c Add option to display "starred categories" on the index page 2021-11-03 23:29:36 +11:00
Oliver
7567b8dd63 MOAR FEATURES: 
- Add admin view for PartCategoryStar
- Add starred status to partcategory API
- Can filter by "starred" status
- Rename internal functions back to using "starred" (front-end now uses the term "subscribe")
 2021-11-03 23:22:31 +11:00
Oliver
f9a00b7a90 Adds extra subsctiption functionality for Part and PartCategory 
- Allows variants and templates
- Allows categories and sub-categories
- Unit testing
 2021-11-03 22:57:49 +11:00
Oliver
cf023e2cc1 Create new model for "PartCategory" 2021-11-03 18:10:34 +11:00
Oliver
4cf6b9bd31 Remove old function 2021-11-03 17:59:08 +11:00
Oliver
e7f6268640 Improvements for alert notifications 
- Dismissable
- Delete after a certain amount of time
 2021-11-03 17:55:30 +11:00
Oliver
85adf842f6 Change bullhorn icon to bell icon 2021-11-03 16:59:59 +11:00
Oliver
63ec5770f4 Merge remote-tracking branch 'inventree/master' into subscription-refactor 2021-11-03 16:55:54 +11:00
Oliver
e5435df2ba Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 15:46:30 +11:00
Oliver
74521b7628
Merge pull request #2239 from SchrodingersGat/more-part-details 
Add more information to the "part details" tab
 2021-11-03 14:18:43 +11:00
Oliver
31ea71d391 Display part category 2021-11-03 14:00:13 +11:00
Oliver
d435689562 Add more information to the "part details" tab 2021-11-03 13:57:50 +11:00
Oliver
ecccae1081 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 13:34:45 +11:00
Oliver
08ffa102c6 Fixes for part category table 
(cherry picked from commit f7ef309995f8a52c213748f4a9226724e288c936)
 2021-11-03 13:34:01 +11:00
Oliver
c4ea3ecf6f Bug fix for stock location table 
(cherry picked from commit 44794d7b78520023e3b70da61dc13938bfd4bd14)
 2021-11-03 13:33:57 +11:00
Oliver
08719d4d1b
Merge pull request #2236 from SchrodingersGat/badge-fix 
Fix CSS for user badges
 2021-11-03 12:41:10 +11:00
Oliver
b1c23e30f5 Fix CSS for user badges 2021-11-03 11:59:20 +11:00
Oliver
c636f13ba8 Template fix for BOM upload 2021-11-03 11:44:42 +11:00
Oliver
1d42d33c8e style fixes 2021-11-03 11:33:44 +11:00
Oliver
be7b224f14 Adds API endpoint for serialization of stock items 2021-11-03 10:12:42 +11:00
Nigel
eecd477a34
Add redis cache to postgres testcase 2021-11-02 16:37:31 -06:00
Nigel
e8c2d4da10
Add support for using redis as a cache and a broker 2021-11-02 16:37:28 -06:00
Oliver
2b69d9c2af Correctly serialize stock when creating via the API 2021-11-03 07:41:47 +11:00
Oliver
ad4c4f2a6d Stock item duplication now works with the API forms 2021-11-03 07:28:21 +11:00
Oliver
aaf27d4098 Adds new buttons to create a new stock item 2021-11-03 07:27:58 +11:00
Oliver
d8e3c40f78 Implementing more complex behaviour for StockItem creation form 2021-11-02 23:04:10 +11:00
Oliver
ef305032c9 Create new stock location via API forms 2021-11-02 20:04:54 +11:00
Oliver
0d9c08b49c StockLocationEdit 2021-11-02 19:58:25 +11:00
Oliver
4c8bc9580c stock-item-edit is looking OK now 2021-11-02 19:51:46 +11:00
Oliver
d357e982f5 Revert stock-item detail template to mater 2021-11-02 19:43:17 +11:00
Oliver
c3c4aca829 Fix action buttons for stock-item detail page 2021-11-02 19:29:26 +11:00
Oliver
8725837460 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-02 19:25:11 +11:00
Oliver
4bfdf21107 Change "star" icon to "bullhorn" icon 2021-11-02 15:07:20 +11:00
Oliver
1dea7861d0 Refactor email body out into a template 
- Will be useful in the future when more email functionality is implemented
 2021-11-02 14:43:57 +11:00
Oliver
e3dfb6cbc8 Improve messaging 2021-11-02 13:08:10 +11:00
Oliver
a3889c709e More tweaks 2021-11-02 12:57:40 +11:00
Oliver
fc9ca5e481 Pretty badges for email accounts 2021-11-02 12:54:41 +11:00
Oliver
ec147ea25f Further work on email settings page 2021-11-02 12:49:44 +11:00
Oliver
d1f2d960be Refactor "user account" page 2021-11-02 12:15:46 +11:00
Oliver
489d085de8 Refactor "category" settings page 2021-11-02 11:32:57 +11:00
Oliver
66b078e4b9 Refactor part settings page 2021-11-02 11:31:24 +11:00
Oliver
2abcb114a8 Visual improvements for "currency" page 2021-11-02 11:28:46 +11:00
Oliver
6f9ac4a850 - Fixes for construct_absolute_url function 
- Refactor notification email generation
- Update template file
- Add separate templates folder for email
 2021-11-02 00:40:25 +11:00
Oliver
dabaa9aea5 Adds a function to construct an "absolute" URL 
Useful for providing an external link (e.g. in an email)
 2021-11-01 23:44:44 +11:00
Oliver
9cbc2b82b5
Merge pull request #2208 from rocheparadox/master 
Email notification for low stock
 2021-11-01 22:45:49 +11:00
Matthias
33d61d8cb5
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2181 2021-11-01 12:31:35 +01:00
Oliver
a1608396cd Expand navbar spacer 2021-11-01 14:16:14 +11:00
rocheparadox
76c1e936db Added post_delete hook to StockItem 
moved the business logic of 'deciding if a low stock notification has to be sent' to part.tasks
 2021-11-01 08:25:59 +05:30
Oliver
2662ba1202 Merge branch 'master' into stock-item-forms 2021-11-01 12:43:32 +11:00
Oliver
f607841601 Fix navbar spacing when "sticky-header" is enabled 2021-11-01 12:07:07 +11:00
Oliver
ad0277a8c3 Merge branch 'master' into stock-item-forms 
# Conflicts:
#	InvenTree/stock/serializers.py
#	InvenTree/stock/templates/stock/item_base.html
 2021-11-01 12:00:40 +11:00
Oliver
94a86e52f8
Merge pull request #2224 from matmair/remove-breadrcumb-space 
remove breadcrub div where no breadcrumb is added
 2021-11-01 11:57:21 +11:00
Matthias Mair
05a86c863f
Update page_base.html 2021-11-01 01:38:21 +01:00
Oliver
b64f0e1f54
Merge pull request #2222 from matmair/ui-navbar 
UI tweaks
 2021-11-01 11:30:27 +11:00
Matthias
338e85ff52
remove breadcrub div where no breadcrumb 2021-11-01 01:09:08 +01:00
Matthias
9a346dd3e2
Revert "remove breadcrub div where no breadcrumb" 
This reverts commit 2c9b03944f.
 2021-11-01 01:07:13 +01:00
Matthias Mair
d89cb0936c
Merge branch 'inventree:master' into plugin-2037 2021-11-01 01:06:26 +01:00
Matthias Mair
c775d030f9
Merge branch 'inventree:master' into matmair/issue2181 2021-11-01 01:06:18 +01:00
Matthias
8da2865299
setting sidebar header different color to items 2021-11-01 00:11:01 +01:00
Matthias
62aa014f6b
add button for navbar toogle 2021-11-01 00:09:38 +01:00
Matthias
2c9b03944f
remove breadcrub div where no breadcrumb 2021-11-01 00:08:39 +01:00
Matthias
f0a558c1e2
remove unneeded spacing 2021-11-01 00:06:08 +01:00
Oliver
80e741fe1b Further improvements for filter elements 2021-11-01 09:21:42 +11:00
Oliver
1f537a50b2 Fix weird height issue for filter tag 2021-11-01 09:11:08 +11:00
Matthias Mair
037f2a9438
Merge branch 'inventree:master' into matmair/issue2181 2021-10-31 23:04:55 +01:00
Matthias Mair
0d836530e4
Merge branch 'inventree:master' into plugin-2037 2021-10-31 23:04:50 +01:00
Oliver
360f0406b5 CSS updates 
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
 2021-11-01 08:38:24 +11:00
rocheparadox
60c2aab06d remove unused imports 2021-10-31 11:30:14 +05:30
rocheparadox
40da41959b Created part.tasks file and moved notify_low_stock function to the same from InvenTree.tasks. The argument type is changed from StockItem to Part 
Added trans to headers of table in email template of low_stock_notification.html

added is_part_low_on_stock() function to the part model to check if the part's stock has fallen below the minimum quantity

used offload_task function to run the low stock notification function asynchronously
 2021-10-31 11:26:41 +05:30
rocheparadox
fca15a0439 added arbitrary args and arbitrary keyword args while executing a function synchronously from offload_task() in inventree.tasks 2021-10-31 11:21:06 +05:30
Oliver
9057462588
Merge pull request #2212 from matmair/matmair/issue2210 
Fix for actions wrapping on smaller screens
 2021-10-31 09:09:27 +11:00
Matthias
199254dfe9
adjust navigation integration to new style 2021-10-30 22:35:47 +02:00
Matthias
0ae514e7be
hide breadcrumb section 2021-10-30 22:15:21 +02:00
Matthias
13cc329dc6
remove unneeded headers 2021-10-30 22:14:57 +02:00
Matthias Mair
b31a1aa4cc fix plugin rendering in settings nav 2021-10-30 18:10:56 +00:00
Matthias
703c8a31b1
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-30 18:23:09 +02:00
Matthias Mair
20a129f396
Merge branch 'inventree:master' into matmair/issue2181 2021-10-30 17:24:03 +02:00
Matthias Mair
6ce10736af
Merge branch 'inventree:master' into matmair/issue2210 2021-10-30 17:23:55 +02:00
Matthias Mair
108f715ef6
Merge branch 'inventree:master' into matmair/issue2213 2021-10-30 17:23:51 +02:00
rocheparadox
6ec2801fce Facilitated translation for low stock notification subject 
moved the message/content of low stock notification to html template
Facilitated translation in low stock notification html template file
 2021-10-30 20:32:10 +05:30
Matthias Mair
14680531f0 [BUG] Auth screens broken 
Fixes #2213
 2021-10-30 14:05:40 +00:00
Oliver
a151a68e58 convert sale_price to string before exporting 2021-10-31 00:05:20 +11:00
Matthias Mair
6af866557d fixes missing wraping on iPdas and iPhones 
Fixes #2210
 2021-10-30 12:34:31 +00:00
Oliver
2bbeab38ff
Merge pull request #2205 from SchrodingersGat/bootstrap-5 
Bootstrap 5
 2021-10-30 23:03:12 +11:00
Oliver
75c8faa09f Tweaks 2021-10-30 22:30:04 +11:00
Oliver
638c9d4007 Enable bootstrap-5 theme for select2 2021-10-30 22:16:40 +11:00
Oliver
2830fc3c7f Fixes 2021-10-30 14:11:03 +11:00
rocheparadox
e0cd02ee60 added dispatch_uid to post_save signal of StockItem 2021-10-30 08:30:39 +05:30
rocheparadox
83309fd054 Fixed the order of fixtures installation for testing 2021-10-30 08:16:42 +05:30
rocheparadox
f2207cc6f8 Merge remote-tracking branch 'upstream/master' 2021-10-30 08:14:53 +05:30
Oliver
29c913b553 Improvements for stock item test result table 2021-10-30 13:31:13 +11:00
Oliver
79434bb4e0 Handle missing report template 2021-10-30 13:28:08 +11:00
Oliver
a689b77cfb More tweaks 2021-10-30 13:18:11 +11:00