inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 19:52:59 +00:00
Code Activity
9,854 Commits 7 Branches 165 Tags
e5435df2ba7fa0fd3d43b2015072eae61918bae2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver e5435df2ba Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-03 15:46:30 +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 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
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
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
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
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 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
Oliver 2662ba1202 Merge branch 'master' into stock-item-forms 2021-11-01 12:43:32 +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
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
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
Oliver be23634c5d Refactor display toggle for part list and part category list 2021-10-30 12:45:07 +11:00
Oliver 3bd59728db CSS tweaks 2021-10-30 08:59:40 +11:00
Oliver fcc1e9fe8f Fixes 2021-10-30 01:00:37 +11:00
Oliver 4eea8c8193 Remove old tree classes 2021-10-30 00:18:41 +11:00
Oliver a792903a79 Catch sidebar error 2021-10-30 00:15:19 +11:00
Oliver a15cc1f3ba linting fixes 2021-10-30 00:07:51 +11:00
Oliver 57240865e8 More tweaking 2021-10-30 00:05:32 +11:00
Oliver 25a5d8de78 Improve visual style of breadcrumbs 2021-10-29 23:28:19 +11:00
Oliver 3849ea8057 Rearranging buttons 2021-10-29 23:20:09 +11:00
Oliver c04118ed8a Driving the refactor tractor around the farm 2021-10-29 22:20:06 +11:00
Oliver b41d1aed12 Refactor admin button for: 
- build order
- part detail
- stock item
- stock location
- company detail
- manufacturer-part
- purchase order
- sales order
 2021-10-29 17:07:35 +11:00
Oliver 8afa39cd91 Refactor "search" page 2021-10-29 13:54:46 +11:00
Oliver 0f10936e65 Refactored index page 
- Looks MUCH nicer now!
 2021-10-29 13:28:21 +11:00
Oliver 6a3c9ead17 Add option to disable "toggle" for sidebar 2021-10-29 11:48:46 +11:00
Oliver 890fd0f1a0 Remove nav tree 2021-10-29 10:54:15 +11:00
Oliver 80a41affc1 More sidebar action 2021-10-29 01:20:24 +11:00
Oliver 1b5428718e Refactored sidebar for "purchase order" 2021-10-29 01:11:00 +11:00
Oliver 00a0311c63 Refactor sidebar for "sales order" page 2021-10-29 01:08:18 +11:00
Oliver 5a2c20ea55 Refactor sidebar for "company" display 2021-10-29 01:05:39 +11:00
Oliver 613b135edf Refactor sidebar for "build order" display 2021-10-29 01:00:39 +11:00
Oliver ec2e06fa15 Refactor sidebar for "settings" window 2021-10-29 00:55:22 +11:00
Oliver 5f139b4aa4 Refactor sidebar for "location" display 2021-10-29 00:43:58 +11:00
Oliver e0d3facfac Refactor sidebar for "stock item" page 2021-10-29 00:40:16 +11:00
Oliver 59acf45ab9 Implement sidebar for "part category" display 2021-10-29 00:29:09 +11:00
Oliver f0fe7f2d5c Complete refactoring of part sidebar 2021-10-29 00:20:39 +11:00
Oliver f542bdc19f badge updates 2021-10-28 22:32:03 +11:00
Oliver 2778ff55da Remove btn-default 2021-10-28 19:57:17 +11:00
Oliver b1cdcdf0b8 More fixes 
- About modal
- Server-side modals
- icon badges
- checkboxes in API forms
 2021-10-28 19:41:46 +11:00
Oliver d0085efa28 Fix server-side modal 2021-10-28 19:10:21 +11:00