Commit Graph

10363 Commits

Author SHA1 Message Date
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
Oliver
b8d6a2830e Remove submodule 2021-11-01 08:17:29 +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
Oliver
b2dd3da518
Merge pull request #2215 from matmair/matmair/issue2213
[BUG] Auth screens broken
2021-10-31 09:05:26 +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
584f53b85e
Merge branch 'plugin-2037' of https://github.com/matmair/InvenTree into plugin-2037 2021-10-30 18:23:14 +02: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
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