Commit Graph

10331 Commits

Author SHA1 Message Date
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
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
Oliver
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
Oliver
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
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
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
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
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
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
Oliver
67debc3a7b
Merge pull request #2223 from matmair/ui-settings-header
setting sidebar ui tweaks
2021-11-01 11:06:07 +11: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
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
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
Oliver
fd2a26c8fa
Merge pull request #2219 from SchrodingersGat/submodule-fix
Remove submodule
2021-11-01 08:36:12 +11:00