Commit Graph

1765 Commits

Author SHA1 Message Date
Oliver
a532babde8 Related part table now uses "loadPartTable" function call 2021-11-25 14:13:49 +11:00
Oliver
ae6ac2ae24
Merge pull request #2360 from matmair/add-translations
Add some missing parts of the UI to translations
2021-11-25 13:27:50 +11:00
Matthias
7ed5338fe9
add some missing parts of the UI to translations 2021-11-25 01:09:36 +01:00
Oliver
749f5e8f9a
Merge pull request #2357 from SchrodingersGat/auto-fill-supplier
Auto-complete 'manufacturer-part' field for supplier-part form
2021-11-24 13:40:38 +11:00
Oliver
201911be05 Auto-complete 'manufacturer-part' field for supplier-part form 2021-11-24 12:46:49 +11:00
Oliver
a13fe1f572 Adds "stock" column to substitute parts dialog 2021-11-24 12:36:10 +11:00
Matthias
6eee332da8
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-23 18:39:51 +01:00
Matthias
d79e9a62b4
fix trans tags 2021-11-22 23:42:29 +01:00
Matthias
2acee580c9
fix template for sidebar_item 2021-11-22 20:42:10 +01:00
Matthias
9556cd594b
fix sidebar_header template -> remove trans 2021-11-22 20:41:31 +01:00
Matthias
c20afad84d
replace sidebar_links 2021-11-22 20:40:01 +01:00
Matthias
72da18719f
fix sidebar header 2021-11-22 20:24:38 +01:00
Matthias
933c420844
fix sidebar translation
Fixes #2347
2021-11-22 20:24:22 +01:00
Matthias
cecee032d7
streamline html templates 2021-11-21 01:21:25 +01:00
Matthias
12fbd92bad
conditional error stack showing 2021-11-20 04:04:52 +01:00
Matthias
0d44a4cfa5
error retrieving tag 2021-11-20 04:00:34 +01:00
Matthias
eee9047818
[FR] Two-Factor Authentication
Fixes #2201
2021-11-19 23:48:12 +01:00
Matthias
3fbc6890c9
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-19 22:58:31 +01:00
Matthias
7dad2b02f0
add default to icon for sidebar item 2021-11-19 22:22:19 +01:00
Matthias
e5d0380356
PEP fixes
finishes work for #2318
2021-11-18 16:35:16 +01:00
Matthias
d750e9e191
reorder fields 2021-11-18 16:26:31 +01:00
Matthias
5dbc5d141a
add plugin install button 2021-11-18 16:16:25 +01:00
Oliver
521ec4f1e6 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/order/serializers.py
2021-11-18 23:43:36 +11:00
Matthias
a95b298c62
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-18 11:37:11 +01:00
Oliver
6dafedd0f3 Adjust login screen 2021-11-18 20:55:10 +11:00
Oliver
cac77ed134 Hide account edit actions in demo mode 2021-11-18 20:37:08 +11:00
Oliver
2a5b882a25 Navbar updates
- Display "demo mode" with link to docs
- Remove "admin" menu action
2021-11-18 20:34:50 +11:00
Oliver
1f5e4a1e6b Adds a template tag for testing if the server is running in demo mode 2021-11-18 20:17:27 +11:00
Matthias Mair
958b47e58b make cols responsive 2021-11-17 19:23:40 +00:00
Matthias Mair
df9d83b3d6 make tables responsive 2021-11-17 19:23:12 +00:00
Oliver
5e04f2acf3 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-17 20:53:26 +11:00
Oliver
9c3b04f771 Adds fallback value if status code color is not defined 2021-11-17 14:09:20 +11:00
Oliver
192cfb80b0 Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/InvenTree/version.py
2021-11-16 17:06:38 +11:00
Matthias
e52dd4828a
customize 503 2021-11-15 23:48:49 +01:00
Matthias
b783ec566c
add maintenance mode 2021-11-15 22:07:30 +01:00
Oliver
20941ce00b JS linting 2021-11-16 00:15:18 +11:00
Oliver
5b0a2576f6 additional filters for "used-in" table 2021-11-16 00:04:06 +11:00
Oliver
6367f1a9ed Improve titles in table 2021-11-16 00:00:52 +11:00
Oliver
ca3c3685fe Tweaks 2021-11-15 23:51:21 +11:00
Oliver
c367fd7941 Fixes multiple issues for "used in" table 2021-11-15 23:51:02 +11:00
Oliver
66032ea77a Indicate that a BOM item is inherited in the "uses" table 2021-11-15 23:14:13 +11:00
Oliver
f3782ae8bc visual improvements for table filter elements 2021-11-15 23:13:58 +11:00
Oliver
d5ebdd035e Search button fix 2021-11-15 23:06:15 +11:00
Oliver
0b487c6111 "used in" table now accommodates "inherited" BOMs 2021-11-15 23:00:05 +11:00
Oliver
00dc7dafe1 Construct "used in" table 2021-11-15 22:39:58 +11:00
Oliver
dad097a3ba Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-15 10:55:17 +11:00
Matthias
b10492f088
rename global settings objects 2021-11-14 00:24:32 +01:00
Matthias
ea277c2ad6
fix url 2021-11-13 00:45:10 +01:00
Matthias
7e478c332a
enable multiple admin buttons on one page 2021-11-13 00:37:18 +01:00
Matthias
e542a8f8e3
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-12 07:51:25 +01:00
Oliver
1deb0f2c1b
Merge pull request #2296 from SchrodingersGat/requires-restart
Requires restart
2021-11-12 16:02:31 +11:00
Matthias
175b6ca053
admin buttons for plugins 2021-11-12 02:14:49 +01:00
Matthias
55b4ba6207
show inactive plugins in ui 2021-11-12 01:54:35 +01:00
Matthias
61f6061edf
adding in license meta 2021-11-12 00:12:03 +01:00
Matthias
b2478b418a
"description" field for plugin
Fixes #2293
2021-11-12 00:09:05 +01:00
Matthias
65046df417
display path in plugin details
Fixes #2294
2021-11-12 00:00:43 +01:00
Matthias
689b414d62
show info if no version exists
Fixes #2295
2021-11-11 23:32:22 +01:00
Matthias
5bb3a95699
Fix theme selector
Fixes #2298
2021-11-11 23:04:16 +01:00
Matthias
1ff9edf490
move theme selection
#2299
2021-11-11 15:54:57 +01:00
Matthias
fa36bcdbca
'safe' loading of links 2021-11-11 13:00:20 +01:00
Matthias
36591a5f6e
fix link 2021-11-11 12:33:11 +01:00
Oliver
cacc272424 Display a wanring message if server restart is required 2021-11-11 22:22:39 +11:00
Matthias
112e04381e
fix badges 2021-11-11 12:20:22 +01:00
Matthias
ab1742da64
remove reduntant block 2021-11-11 12:19:11 +01:00
Matthias
b4faaa7a46
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-11 12:18:13 +01:00
Oliver
626637a06a Add "hidden" property to global settings
- Allows certain settings to be hidden from the javascript files
2021-11-11 22:16:46 +11:00
Oliver
d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
2021-11-11 12:35:59 +11:00
Oliver
9a017d950e
Merge pull request #2288 from matmair/matmair/issue2278
Add setting for enabeling reports
2021-11-11 11:23:32 +11:00
Matthias
fcc94b3902
remove empty breadcrumb space in settings 2021-11-11 00:28:30 +01:00
Matthias
bae28e8207
Add setting for enabeling reports
Fixes #2278
2021-11-10 23:54:54 +01:00
Matthias
f9c004bd36
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-10 23:20:39 +01:00
Matthias
d982bfe201
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-10 00:37:49 +01:00
Matthias
2835022330
merge 2021-11-10 00:30:21 +01:00
Oliver
85b906f49d Adds "stock" column sorting for stock table 2021-11-10 09:48:52 +11:00
Oliver
cfb873bb4f Bug fix for loading part table without enabling grid view 2021-11-09 22:47:19 +11:00
Oliver
db31bf91e6 Improve display of "no response from server" message 2021-11-09 22:41:54 +11:00
Oliver
8d7b73e2a8 Adds support for "multiple choice" field 2021-11-09 22:25:42 +11:00
Oliver
1e80e33634 typo fix 2021-11-09 21:49:14 +11:00
Oliver
11dd187df2 javascript linting 2021-11-09 21:43:47 +11:00
Oliver
eb5b810be0 Update displayed setting when API returns success 2021-11-09 21:29:31 +11:00
Oliver
5df4374607 javascript for editing settings via API 2021-11-09 21:16:37 +11:00
Oliver
cb583eb466 Add LIST endpoint for global settngs and user settings
- Read only, cannot create new settings
- User settings filters against the user making the request
2021-11-09 15:59:09 +11:00
Oliver
1520c296dd
Merge pull request #2270 from SchrodingersGat/navbar-fix
Fixes navbar menu positioning for smaller screens
2021-11-08 17:44:21 +11:00
Oliver
35cfa387d1 Fixes navbar menu positioning for smaller screens 2021-11-08 13:38:03 +11:00
Oliver
8d5c3ab18a add extra icons for build order form 2021-11-08 13:10:33 +11:00
Oliver
9c2193a4cc
Merge pull request #2265 from matmair/matmair/issue2257
Matmair/issue2257
2021-11-08 11:10:53 +11:00
Oliver
a12baadc09
Merge pull request #2266 from SchrodingersGat/login-tweaks
Login tweaks
2021-11-08 10:19:23 +11:00
Oliver
ac97edd18b JS linting 2021-11-08 09:58:55 +11:00
Oliver
c9924470ad Replace dialog messages with alerts 2021-11-08 09:44:45 +11:00
Oliver
ef75838ab8 Properly display notifications when logging in 2021-11-08 09:34:57 +11:00
Oliver
079c08ef7d Tweaks to account screens css 2021-11-08 09:34:42 +11:00
Matthias Mair
87539c7aac select for languages should be wide enough 2021-11-06 20:59:02 +00:00
Matthias Mair
30aa072537 fix message 2021-11-06 20:49:09 +00:00
Matthias Mair
45b7bc0c51 always show the current language 2021-11-06 20:41:52 +00:00
Matthias Mair
dccc832779 fix logic 2021-11-06 20:41:29 +00:00
Matthias Mair
cea466973a Check if language has enough translations
Fixes #2257
2021-11-06 19:55:02 +00:00
Matthias Mair
857cdd5aea Enlsigh is the base - always translated!
Fixes #2257
2021-11-06 17:41:11 +00:00
Matthias Mair
bbd723a176 fix QR code alingment 2021-11-06 15:11:31 +00:00
Matthias Mair
ad5ba96278 move toggler to the end 2021-11-06 15:07:01 +00:00
Matthias Mair
19a3568511 fix nav arranging on mobile 2021-11-06 15:02:40 +00:00
Matthias Mair
d604b2afff make padding uniform 2021-11-06 14:44:46 +00:00
Oliver
1f1cf9f9e4 Allow escape key on barcode modal 2021-11-05 10:39:03 +11:00
Matthias
df72cb2608
merge upstream 2021-11-04 23:44:41 +01:00
Matthias Mair
f5fa64d9a9
Merge branch 'inventree:master' into plugin-2037 2021-11-04 23:42:07 +01:00
Oliver
083967b156
Merge pull request #2198 from SchrodingersGat/stock-item-forms
Stock item forms
2021-11-05 07:37:33 +11:00
Oliver
185924e1f8 More linting 2021-11-05 00:35:47 +11:00
Oliver
5a0ff4c077 JS linting 2021-11-05 00:32:11 +11:00
Matthias
0daba629fe
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 14:23:17 +01:00
Oliver
f27acde934 More fixes
- Allow stock item creation for inactive parts
- Better handling of successful stock item creation
- Disable fields rather than hiding them
2021-11-05 00:02:55 +11:00
Matthias
80414ba6b5
make icon optional 2021-11-04 13:44:25 +01:00
Matthias
267c5ca40c
show install method for plugin 2021-11-04 13:30:40 +01:00
Matthias
99c3bc5529
make package info conditional 2021-11-04 13:21:02 +01:00
Matthias
41954fd2d6
make naming less git related 2021-11-04 13:19:08 +01:00
Oliver
b41dbba2b0 Correctly handle serialization of newly created stock 2021-11-04 23:18:59 +11:00
Oliver
3be4acf3ef More refactoring for notifications
- Adds default behaviour for successful stock item creation
2021-11-04 23:09:49 +11:00
Matthias
c085a86891
naming refactor 2021-11-04 12:55:39 +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
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
39d3a127e1 Template improvements 2021-11-04 16:19:57 +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
47f6a8266d Fix for tree-view
- Force "cascade" to be set
2021-11-04 15:08:22 +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
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
Matthias
83d0693013
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-03 21:25:04 +01: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
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
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
Matthias
e3b02e596e
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-11-03 00:25:39 +01: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
8725837460 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-02 19:25:11 +11:00
Matthias
e73d3d567c
fix MFA buttons 2021-11-02 07:56:59 +01: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
Matthias
58f35ebc56
use buttons isntead of links 2021-11-01 23:49:22 +01:00
Matthias
70341d6745
refactor of backup tokens 2021-11-01 23:33:29 +01:00
Matthias
f8a45dcec2
back button 2021-11-01 23:23:50 +01:00
Matthias
7bcab13253
translate disable button 2021-11-01 23:19:50 +01:00
Matthias
b4570f6a7e
use alert 2021-11-01 23:11:48 +01:00
Matthias
7dbbca5b3a
fix translation 2021-11-01 23:11:41 +01:00
Matthias
4e9cf8492f
full width 2021-11-01 23:11:14 +01:00
Matthias
024a9deab4
full width buttons 2021-11-01 23:07:39 +01:00
Matthias
0011c7ee62
crispyfy 2021-11-01 23:07:27 +01:00
Matthias
240859c38c
make crispy 2021-11-01 23:03:36 +01:00
Matthias
58bc677029
more contrast for the qr 2021-11-01 22:58:47 +01:00
Matthias
6404764025
crispyfy 2021-11-01 22:51:42 +01:00
Matthias
3cb2078821
fix spelling 2021-11-01 22:46:56 +01:00
Matthias
fc0e80dd76
make remove button conditional 2021-11-01 22:45:56 +01:00
Matthias
392e7f6e4c
there can be only one factor 2021-11-01 22:43:43 +01:00
Matthias
17e7c2ee15
disable add button if already set up 2021-11-01 22:43:28 +01: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
Matthias
62adb95d3c
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-11-01 12:35:25 +01:00
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
9d68d6bdca
added setting to anable MFA 2021-11-01 00:34:00 +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