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
9,895 Commits 9 Branches 164 Tags
2130b02e7f70e75c5bd75eb3e60f8900e22de73c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 2130b02e7f Merge pull request #2193 from matmair/matmair/issue2181 
Add missing part import fields
 2021-11-04 16:54:30 +11:00
OliverandGitHub 345bccb9bc Merge pull request #2248 from SchrodingersGat/email-fixes 
Fixes for low-stock emails
 2021-11-04 16:48:28 +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
OliverandGitHub 3b052e6bce Merge pull request #2247 from SchrodingersGat/tree-view-fixes 
Fix for tree-view
 2021-11-04 15:30:07 +11:00
OliverandGitHub 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
Oliver 6db6a70fc2 Add task to check required stock for build order 2021-11-04 13:32:14 +11:00
OliverandGitHub 5cd2a14314 Merge pull request #2245 from SchrodingersGat/bom-export-fix 
Refactored bom export
 2021-11-04 12:28:01 +11:00
Oliver 9dba3c3f10 Refactored bom export 2021-11-04 12:10:36 +11:00
OliverandGitHub 8025dab69b Merge pull request #2244 from SchrodingersGat/notification-fox 
Fix for missing template file
 2021-11-04 10:56:48 +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
OliverandGitHub 7aacd8b36c Merge pull request #2242 from matmair/patch-1 
Small fixes for bug report template
 2021-11-04 09:57:27 +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
OliverandGitHub 0e2e6211b6 Merge pull request #2233 from SchrodingersGat/subscription-refactor 
Refactor "star" functionality for part model
 2021-11-04 09:05:03 +11:00
Oliver 52242e7a00 Catch error 2021-11-04 08:40:38 +11: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
OliverandGitHub 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
OliverandGitHub 7d20003137 Merge pull request #2238 from SchrodingersGat/table-fix 
Table fix
 2021-11-03 13:57:54 +11:00
Oliver d435689562 Add more information to the "part details" tab 2021-11-03 13:57:50 +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
OliverandGitHub 08719d4d1b Merge pull request #2236 from SchrodingersGat/badge-fix 
Fix CSS for user badges
 2021-11-03 12:41:10 +11:00
OliverandGitHub d0e80b7638 Merge pull request #2235 from SchrodingersGat/duplicate-bom-import-fix 
Template fix for BOM upload
 2021-11-03 12:41:03 +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
OliverandGitHub 96a89558b4 Merge pull request #2231 from SchrodingersGat/outgoing-email 
Refactor email body out into a template
 2021-11-02 15:07:23 +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
OliverandGitHub 9b0d8bedb5 Merge pull request #2230 from SchrodingersGat/settings-visual-refactor 
Settings visual refactor
 2021-11-02 14:20:47 +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
OliverandGitHub c31a62cc02 Merge pull request #2229 from SchrodingersGat/low-stock-email-template 
Low stock email updates
 2021-11-02 01:06:51 +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
OliverandGitHub 9cbc2b82b5 Merge pull request #2208 from rocheparadox/master 
Email notification for low stock
 2021-11-01 22:45:49 +11:00
OliverandGitHub ae2198fc0c Merge pull request #2227 from SchrodingersGat/spacer-fix 
Expand navbar spacer
 2021-11-01 14:46:07 +11:00
Oliver a1608396cd Expand navbar spacer 2021-11-01 14:16:14 +11:00
OliverandGitHub d5fb699016 Merge pull request #2226 from SchrodingersGat/navbar-fix 
Fix navbar spacing when "sticky-header" is enabled
 2021-11-01 12:42:29 +11:00
Oliver f607841601 Fix navbar spacing when "sticky-header" is enabled 2021-11-01 12:07:07 +11:00
OliverandGitHub 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
OliverandGitHub b64f0e1f54 Merge pull request #2222 from matmair/ui-navbar 
UI tweaks
 2021-11-01 11:30:27 +11:00
OliverandGitHub 67debc3a7b Merge pull request #2223 from matmair/ui-settings-header 
setting sidebar ui tweaks
 2021-11-01 11:06:07 +11:00
OliverandGitHub 5de85d893c Merge pull request #2220 from SchrodingersGat/flex-wrap 
CSS updates
 2021-11-01 09:41:37 +11: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
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
OliverandGitHub fd2a26c8fa Merge pull request #2219 from SchrodingersGat/submodule-fix 
Remove submodule
 2021-11-01 08:36:12 +11:00
Oliver b8d6a2830e Remove submodule 2021-11-01 08:17:29 +11:00
OliverandGitHub 9057462588 Merge pull request #2212 from matmair/matmair/issue2210 
Fix for actions wrapping on smaller screens
 2021-10-31 09:09:27 +11:00
OliverandGitHub b2dd3da518 Merge pull request #2215 from matmair/matmair/issue2213 
[BUG] Auth screens broken
 2021-10-31 09:05:26 +11:00
OliverandGitHub fe5cb3ddca Merge pull request #2214 from SchrodingersGat/sales-order-export-fix 
convert sale_price to string before exporting
 2021-10-31 00:34:28 +11:00
OliverandGitHub 3423cb9d7c Merge pull request #2209 from matmair/test-branch 
Update README.md
 2021-10-31 00:06:11 +11:00
Oliver a151a68e58 convert sale_price to string before exporting 2021-10-31 00:05:20 +11:00
OliverandGitHub 2a58ad97dc Merge pull request #2206 from matmair/gitpod 
Add definition for Gitpod.io
 2021-10-30 23:06:40 +11:00
OliverandGitHub 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
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
OliverandGitHub eb18ad6c4c Merge pull request #2164 from nwns/feature/postgrestimeouts 
Set some sensible postgres timeouts
 2021-10-30 13:14:13 +11:00
Oliver c4c533bee0 JS linting 2021-10-30 13:03:52 +11:00
Oliver c2a8cfd183 PEP style fixes 2021-10-30 12:57:49 +11:00
Oliver 8e1d9c281a Adds tree view for stock locations 2021-10-30 12:53:25 +11:00