Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,546 Commits 6 Branches 99 Tags 484 MiB
71a0d8159e
Commit Graph

2092 Commits

Author SHA1 Message Date
Oliver
0002edc32c Hide "restart required" message in demo mode 2022-01-10 08:50:50 +11:00
Oliver
af1bfb2f87 Merge remote-tracking branch 'inventree/master' into triggers 2022-01-09 08:15:47 +11:00
Oliver
d8057e88e7 Fix messaging in build complete dialg 2022-01-09 07:50:08 +11:00
Oliver
ff7a75266b Fixes for stock location forms 2022-01-08 20:28:57 +11:00
Oliver
af18d16d98 Tweak admin area icon 2022-01-08 20:19:18 +11:00
Oliver
77decc72ed Extra bug fix for part variant form 2022-01-08 20:07:54 +11:00
Oliver
137a668452 Remove duplicated settings display 2022-01-08 13:29:13 +11:00
Oliver
9e2250e9b8 Bug fixes for settings 2022-01-08 13:19:16 +11:00
Oliver
04d25a60b0 Adds sample plugin which responds to triggered events 
- Adds some example trigger events for the "Part" model
 2022-01-08 09:07:27 +11:00
Oliver
8ff3bf1ad1 Adds a new setting to enable event responses 2022-01-07 21:53:42 +11:00
Oliver Walters
794a9e75e8 Add validation for scheduled tasks defined by a plugin 2022-01-07 15:37:43 +11:00
Oliver
7967c0c0bd
Merge pull request #2492 from SchrodingersGat/plugin-settings-refactor 
Plugin settings refactor
 2022-01-07 14:12:22 +11:00
Oliver Walters
aaf35e6c76 Customize text if totalRows not known 2022-01-07 13:14:47 +11:00
Oliver Walters
12b3a5c9cc Validate and save the new serailizer 2022-01-07 11:33:27 +11:00
Matthias Mair
978018e284
Merge branch 'inventree:master' into matmair/issue2279 2022-01-07 00:08:17 +01:00
Oliver
963ac35a5b Tweaks for settings pages 2022-01-04 21:57:09 +11:00
Oliver
928b90a833 Edit plugin settings via the "settings" display 2022-01-04 21:03:01 +11:00
Oliver
dc9e25ebad Adds API endpoints for viewing and updating plugin settings 
A lot of code updates / refactoring here to get this to work as expected
 2022-01-04 20:27:35 +11:00
Oliver
f3bfe6e7ca More refactoring: 
- Rename "mixins_globalsettings" to "mixing_settings"
- Fix translation on settings page template
 2022-01-02 11:22:05 +11:00
Oliver
182849e160 Fix for settings template 2021-12-31 15:24:56 +11:00
Oliver
553b998c9c CSS fixes 2021-12-31 15:23:44 +11:00
Oliver
572f4a21b3 capitalization 2021-12-30 23:13:33 +11:00
Oliver
76fe774b6e Visual tweaks 2021-12-30 23:11:12 +11:00
Oliver
f97ffaf9c3 Visual tweak to settings page 2021-12-30 23:08:33 +11:00
Matthias Mair
5c4c9bfaed
Merge branch 'inventree:master' into matmair/issue2279 2021-12-29 23:54:54 +01:00
Oliver
3921af821c Fix filtering for part purchase order table 2021-12-22 10:58:46 +11:00
Oliver
774d834b7e
Merge pull request #2477 from SchrodingersGat/duplicate-bom-form 
Duplicate bom form
 2021-12-21 23:06:44 +11:00
Oliver
2c0da25cbc "Validate BOM" now uses the API also 2021-12-21 22:45:59 +11:00
Oliver
70f9a0fe13 Furher logic improvements to BOM copy 
- Remove "self" part from list
- Stop inherited BOM items from being copied incorrectly
- Allow user to select whether "inherited" BOM items are copied
 2021-12-21 22:07:08 +11:00
Oliver
0c8a047bc2 Adds simply endpoint for BOM duplication 2021-12-21 17:29:14 +11:00
Oliver
0060bb074e Updates for various part views 2021-12-21 16:56:47 +11:00
Oliver
103f98b665 Adds "reload" button to attachment table(s) 2021-12-21 16:51:26 +11:00
Oliver
9884c0fadb Adds filters for "manufacturer-parts" list 2021-12-21 16:47:20 +11:00
Oliver
46aeafb5da Adds filter for "assigned stock" view on customer page 2021-12-21 16:44:49 +11:00
Oliver
0a21512329 Adds refresh and filtering for "company" table 2021-12-21 16:41:34 +11:00
Oliver
fcb2bb2a46 Fix behaviour on deleting parent stock item 2021-12-21 01:03:37 +11:00
Oliver
552ca8e5c4 Adds javascript function to merge multiple stock items together 2021-12-20 22:09:08 +11:00
Oliver
189f836e47
Merge pull request #2466 from SchrodingersGat/depleted-badge 
Float "depleted" badge to the right
 2021-12-20 14:25:03 +11:00
Oliver
c060bc0815 Float "depleted" badge to the right 2021-12-20 13:30:54 +11:00
Oliver
ec4f898562 Cleanup search results page 2021-12-20 13:10:48 +11:00
Oliver
81a3547120 Hide "receive parts" button for orders which have been cancelled 2021-12-20 11:17:29 +11:00
Matthias Mair
acbee38600
Merge branch 'inventree:master' into matmair/issue2279 2021-12-15 00:20:48 +01:00
Oliver
597d26d3d4
Merge pull request #2452 from SchrodingersGat/bom-export-form-fixes 
BOM export form fixes
 2021-12-14 23:15:51 +11:00
sintech
58364bb3b5 JS style fix 2021-12-14 11:30:09 +03:00
sintech
b6d9bc3093 Remove treeview state saving. 2021-12-13 15:51:34 +03:00
Oliver
922b8b1c30 Fix typo 
(cherry picked from commit 673a5779f9)
 2021-12-13 23:12:18 +11:00
Oliver
01ce752a8c BOM export options are now han 
(cherry picked from commit c797eb0703)
 2021-12-13 23:12:11 +11:00
Oliver
88fc0393b7 Logic fix for boolean fields in JS forms 
(cherry picked from commit 10dec7743e)
 2021-12-13 23:11:56 +11:00
Oliver
d75ce451be Allow user to select file format when downloadin BOM import template 
(cherry picked from commit 8030ca0bb9)
 2021-12-13 23:11:42 +11:00
sintech
40f73b00ce Propagate expanded state all the way to the root 2021-12-12 19:59:18 +03:00
sintech
e9650a94f3 Do not show icons for childless categories 2021-12-12 19:57:30 +03:00
Matthias
67b3c339b9
add back button to setup screen 2021-12-11 22:10:05 +01:00
Matthias Mair
271ad1dc87
Merge branch 'inventree:master' into matmair/issue2279 2021-12-11 00:09:32 +01:00
Matthias Mair
89758f28b2
Merge branch 'inventree:master' into matmair/issue2201 2021-12-11 00:08:29 +01:00
Oliver
dfd7a439a6
Merge pull request #2445 from SchrodingersGat/issue2250 
Issue2250
 2021-12-11 09:15:37 +11:00
Oliver
e1a5192604 Calculate how many items to assign to sales order 
- Do not over-allocate by default
 2021-12-11 00:45:53 +11:00
Oliver
b908aa2467 fix js linting issues 2021-12-11 00:33:16 +11:00
Oliver
e9ae3eb01d Revert to bootstrap-treeview 
- More "bootstrappy" design
- Already in code base
- Cleaner API
 2021-12-11 00:25:44 +11:00
Oliver
7dcd166d50 Change "sidetree" to "breadcrumb-tree" 2021-12-10 22:53:19 +11:00
Oliver
ffe970d139 Move "sidetree" to underneath breadcrumbs 2021-12-10 22:31:11 +11:00
Matthias Mair
25e0324eb1
Merge branch 'inventree:master' into matmair/issue2279 2021-12-09 23:56:27 +01:00
Matthias Mair
75aeab48b8
Merge branch 'inventree:master' into matmair/issue2250 2021-12-09 23:56:08 +01:00
Matthias
869324249e
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-09 23:54:55 +01:00
Oliver
c1163b9f6b Adds missing semicolon 2021-12-09 09:07:36 +11:00
Matthias
3a3f8ba4ef
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-08 18:31:33 +01:00
Matthias Mair
cdcac90319
Merge branch 'inventree:master' into matmair/issue2279 2021-12-08 18:27:57 +01:00
Oliver
4a453b0a35 Assign multiple stock items to a customer at one 2021-12-09 00:33:45 +11:00
Oliver
96a885e4e1 client side form for assigning stock items to customers 2021-12-09 00:20:45 +11:00
Matthias
2725a2eb87
disable icons 2021-12-08 02:01:26 +01:00
Matthias
79a60ff895
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 2021-12-08 01:11:35 +01:00
Matthias
12afb19dfa
move toggle 2021-12-08 01:11:21 +01:00
Matthias
45181904af
fix icon 2021-12-08 00:26:56 +01:00
Matthias
5ed163dd71
add new toggler 2021-12-08 00:22:00 +01:00
Matthias
596532f312
only one api call 2021-12-08 00:05:34 +01:00
Matthias
948270bbcb
add stuff to mark starting endpoint 2021-12-07 23:54:45 +01:00
Matthias
fbc4cfe166
remove always show 2021-12-07 00:52:14 +01:00
Matthias
46279c8172
fix design refs 2021-12-07 00:51:44 +01:00
Matthias
2fa67707bd
Add text 2021-12-07 00:51:27 +01:00
Matthias
99a62b2934
move border on right side to items 2021-12-07 00:41:37 +01:00
Oliver
463192e0b9 Improved table filtering for "purchase order" table (as seen from "part" view) 2021-12-07 10:33:09 +11:00
Matthias
61bdf8937c
style fix 2021-12-07 00:30:50 +01:00
Matthias
388b42a407
use sidebar-wrapper for styleing 2021-12-07 00:26:36 +01:00
Matthias
f375ba96ae
add sidetree toggler function 2021-12-07 00:21:33 +01:00
Matthias
b5ae9edc2e
style fixes 2021-12-06 23:48:21 +01:00
Matthias
c703f9993f
make url simpler 2021-12-06 22:37:42 +01:00
Matthias
8e425e67a1
reduce 2021-12-06 22:37:17 +01:00
Matthias
70939a0cf9
first working example 2021-12-06 22:35:14 +01:00
Matthias
de4d057b93
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250 2021-12-06 01:37:48 +01:00
Matthias
9ebbf8190c
add tree to replication 2021-12-06 01:35:14 +01:00
Matthias
49f9cc7edc
modifiy sidebar code 2021-12-06 01:33:41 +01:00
Matthias
bb2ad7c2cb
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-04 18:04:47 +01:00
Matthias Mair
2a0e07abe0
Merge branch 'inventree:master' into matmair/issue2201 2021-12-04 17:53:13 +01:00
Matthias Mair
0d9f76a019
Merge branch 'inventree:master' into matmair/issue2279 2021-12-04 17:52:58 +01:00
Oliver
9e1251d78d Adds "assigned_to_me" filtering to build orders 2021-12-04 21:30:11 +11:00
Oliver
087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Oliver
9ec5e39c50 js tweaks 2021-12-04 17:50:25 +11:00
Oliver
008c52ef39 Allocation by serial number now moved to the API 2021-12-04 13:08:00 +11:00
Matthias
1ba7110cda
change templates to new way 2021-12-04 02:19:12 +01:00
Oliver
e9796676c0 Add a progress spinner to modal forms 2021-12-04 10:44:48 +11:00
Oliver
921ef5ae9e Tweaks to PO and SO tables 2021-12-04 10:11:18 +11:00
Oliver
1215ef520d Further JS linting 2021-12-04 09:44:23 +11:00
Oliver
35b3bc73cc Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/order/api.py
 2021-12-04 09:35:54 +11:00
Oliver
3abad2f73d js linting 2021-12-04 09:33:42 +11:00
Oliver
f6e1de42f5 JS linting 2021-12-03 21:16:58 +11:00
Oliver
acfafe22c5 order lines can be received directly from the new table 2021-12-03 21:07:09 +11:00
Oliver
6d90ded27f First pass at a part-purchase-order table 2021-12-03 20:54:21 +11:00
Oliver
c93009876d UI changes 2021-12-03 20:14:09 +11:00
Matthias
daebae81c1
fix spelling 
using c instead of k does not make it Englisch
 2021-12-03 08:00:04 +01:00
Matthias
86014dd4c9
fix panel headings 2021-12-03 07:58:47 +01:00
Oliver
d7c87300c6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-12-03 17:31:27 +11:00
Matthias
0f0460f8ea
merge 2021-12-02 17:24:07 +01:00
Matthias
329b00ae07
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-02 17:16:26 +01:00
Matthias Mair
932b78d3e8
Merge branch 'inventree:master' into matmair/issue2279 2021-12-02 17:08:18 +01:00
Oliver
96c1f74cd8
Merge pull request #2408 from SchrodingersGat/initial-stock-when-duplicating 
Add option for creating initial stock quantity when duplicating a part
 2021-12-03 00:29:37 +11:00
Oliver
9ca6204d4b Add option for creating initial stock quantity when duplicating a part 
Fixes https://github.com/inventree/InvenTree/issues/2407
 2021-12-03 00:05:55 +11:00
Oliver
e1668c8662 More stuffs: 
- Allow filtering of salesorderlineitem by "completed" status
- Allow deletion of (empty) shipment
- Show which items are going to be shipped
 2021-12-02 23:52:53 +11:00
Oliver
e74e7138a9 More stuff: 
- Pass tracking number through when completing a shipment
- Reload tables automatically when certain actions are performed
- Limit stock items to only those with available stock
 2021-12-02 21:59:59 +11:00
Oliver
d5ace1a8da Differentiate between "fully allocated" and "partially allocated" in stock item table 2021-12-02 21:46:05 +11:00
Oliver
586d38fb61 Add item count to shipment table 2021-12-02 21:40:21 +11:00
Oliver
123aab89bc Adds an "available" filter for stock item API 2021-12-02 21:40:03 +11:00
Oliver
6ec0cfc641 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/company/templates/company/company_base.html
#	InvenTree/stock/templates/stock/item_base.html
 2021-12-02 20:49:13 +11:00
Matthias Mair
cf3d2d0df9
Merge branch 'inventree:master' into load-minified-fa 2021-12-02 09:23:13 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias
0379498ee3
merge master in 2021-12-02 09:17:57 +01:00
Oliver
8c6b82d2c0
Merge pull request #2405 from SchrodingersGat/jump-to-sn 
Jump to sn
 2021-12-02 16:26:21 +11:00
Oliver
98bbee8159 Adds function to lookup stock item by serial number 2021-12-02 15:55:00 +11:00
Matthias
8c3b4badfb
and cleanup again 2021-12-02 00:08:46 +01:00
Matthias
61b53a10b0
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2021-12-01 23:59:22 +01:00
Matthias
7273ed74c6
clean up PR 2021-12-01 23:38:24 +01:00
Matthias
4683672d91
load minified fontawesome css 2021-12-01 22:32:40 +01:00
Matthias
53b57cfa70
laod minified fontawesome js 2021-12-01 22:31:16 +01:00
Matthias
413968a979
load minified js 2021-12-01 22:28:43 +01:00
Matthias
a653f322b3
show delete button only selective 2021-11-30 23:22:20 +01:00
Matthias
cefc4af861
add delete button for notifications 2021-11-30 23:19:58 +01:00
Oliver
84115b3a8e Reduce width of thumbnail div 2021-12-01 08:07:09 +11:00
Oliver
a2a436ea69 Column improvements 2021-12-01 08:05:30 +11:00
Matthias
d34aa04c7d
refactor 
to only have one read state updater js codeblock
 2021-11-30 17:11:33 +01:00
Matthias
93f9fe9684
update indicator when table is updated 2021-11-30 17:00:02 +01:00
Matthias
791da9b322
add notification counter to indicator 2021-11-30 16:56:55 +01:00
Matthias
5614fde368
change out icons 2021-11-30 16:55:39 +01:00
Oliver
b34b3c6d85 Place part details below main part display tab 2021-11-30 19:38:48 +11:00
Oliver
6e9937e0e9 Don't be dull, check for null 2021-11-30 15:24:19 +11:00
Oliver
3f9b280e17 Allow shipment numbers to be non-unique for different sales orders 
- must be unique for a given sales order
 2021-11-30 00:42:30 +11:00
Oliver
f3f3030b37 Adds API endpoint to "ship" a sales order shipment 2021-11-30 00:02:03 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Matthias
d6dc4dd035
Merge branch 'matmair/issue2279' of https://github.com/matmair/InvenTree into matmair/issue2279 2021-11-29 08:42:57 +01:00
Matthias
07b0577b94
enable the notification panel to mark messages as read 2021-11-29 01:49:35 +01:00
Matthias
5bfe891208
add button for unread + refactor 2021-11-29 01:09:36 +01:00
Matthias
06f6587050
add endpoint + buttons to mark a notification read 2021-11-29 01:08:06 +01:00
Oliver
7b339b35cc Small UI tweaks for "sessions" view 2021-11-29 07:46:37 +11:00
Matthias Mair
b687659ddd
Merge branch 'inventree:master' into matmair/issue2327 2021-11-28 17:26:19 +01:00
Matthias Mair
e34de8204a
Merge branch 'inventree:master' into matmair/issue2279 2021-11-28 17:26:15 +01:00
Matthias Mair
baf19c2021
Merge branch 'inventree:master' into plugin-2037 2021-11-28 17:26:09 +01:00
Oliver
32be39774f PEP fixes 2021-11-28 22:36:47 +11:00
Oliver
78309c1915 Move validation to the model class 2021-11-28 22:29:01 +11:00
Oliver
4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Matthias
539910c594
translate mesages 2021-11-28 02:39:57 +01:00
Matthias
a57c634cfd
add item link 2021-11-28 01:33:13 +01:00
Matthias
bb1c01635e
fix read flag 2021-11-27 22:40:03 +01:00
Matthias
c4c43135f1
Add base UI elements 2021-11-27 21:23:56 +01:00
Matthias
a9995087ac
move spacing from id to class 2021-11-27 16:21:17 +01:00
Matthias
dd44eb389f
add a notification message model 
part of #2282
 2021-11-27 16:02:23 +01:00
Matthias
6b53fd2bd4
Base html 
[FR] Notification centre
Fixes #2279
 2021-11-27 02:22:39 +01:00
Matthias
84f0966e4f
movelanguage to display settings 2021-11-27 00:02:39 +01:00
Matthias
db1a434f81
[FR] User sessions 
Fixes #2327
 2021-11-26 23:56:24 +01:00
Oliver
ad6e34953b Update placeholders for serial numbers when creating a new stock item 2021-11-27 00:17:31 +11:00
Oliver
ef7a9b5152 Adds a simple endpoint for accessing serial number information for a Part instance 
- This is not included by default in the "part detail" endpoint as it must be calculated!
 2021-11-27 00:11:18 +11:00
Oliver
0b997dc784 Display both 'allocated' and 'fulfilled' quantity values in salesorder table 2021-11-26 23:30:34 +11:00
Oliver
c943b320e6 shipment table tweaks 2021-11-26 23:02:29 +11:00
Oliver
8eb5e79070
Merge pull request #2368 from SchrodingersGat/responsible-column 
Adds "responsible" row to purchase order table
 2021-11-26 22:31:39 +11:00
Oliver
d5e7489623 Table filters 2021-11-26 22:31:25 +11:00
Oliver
760c80dbb6 Merge remote-tracking branch 'inventree/master' into partial-shipment 2021-11-26 22:08:17 +11:00
Oliver
ac645b1fc7 Adds "responsible" row to purchase order table 2021-11-26 22:05:27 +11:00
Oliver
268bfda065 Layout tweaks for settings page 2021-11-26 21:02:06 +11:00
Oliver
68e2b0850b Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/build/serializers.py
#	InvenTree/order/templates/order/so_sidebar.html
 2021-11-26 08:25:51 +11:00
Oliver
6a948a1a20 javascript linting 2021-11-25 15:14:16 +11:00
Oliver
e6dfe27c57 Add a "related parts table" function 2021-11-25 14:54:21 +11:00
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