Commit Graph

2092 Commits

Author SHA1 Message Date
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
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
Matthias
2c9b03944f
remove breadcrub div where no breadcrumb 2021-11-01 00:08:39 +01:00
Matthias
d8fb6d44ec
adds faktors to user settings 2021-10-31 23:42:31 +01:00
Oliver
80e741fe1b Further improvements for filter elements 2021-11-01 09:21:42 +11:00
Matthias
85da98a004
use auth screen to make more clear this is about security 2021-10-31 23:07:25 +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
Matthias
487bab5162
cleanup 2021-10-31 14:02:24 +01:00
Matthias
9fd66e9f22
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-10-31 13:56:14 +01:00
Matthias
ec17bbcb95
mkaeuser setting tighter 2021-10-31 13:54:12 +01:00
Matthias
06822303bc
refactor user settings 2021-10-31 13:42:41 +01:00
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
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
703c8a31b1
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-30 18:23:09 +02:00
Matthias Mair
14680531f0 [BUG] Auth screens broken
Fixes #2213
2021-10-30 14:05:40 +00:00
Oliver
eaa315e726 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/build/templates/build/build_base.html
#	InvenTree/order/templates/order/order_base.html
#	InvenTree/order/templates/order/sales_order_base.html
#	InvenTree/order/templates/order/sales_order_detail.html
#	InvenTree/order/templates/order/so_navbar.html
2021-10-30 23:44:06 +11:00
Matthias Mair
6af866557d fixes missing wraping on iPdas and iPhones
Fixes #2210
2021-10-30 12:34:31 +00: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
29c913b553 Improvements for stock item test result table 2021-10-30 13:31:13 +11:00
Oliver
a689b77cfb More tweaks 2021-10-30 13:18:11 +11:00
Oliver
c4c533bee0 JS linting 2021-10-30 13:03:52 +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
fcc1e9fe8f Fixes 2021-10-30 01:00:37 +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
00a0311c63 Refactor sidebar for "sales order" page 2021-10-29 01:08:18 +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
Matthias
527bc4381d
show messages in base 2021-10-28 11:39:28 +02: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
Oliver
3ce8ba85f4 Further badge tweaks 2021-10-28 17:57:03 +11:00
Oliver
f8ac016d60 replace labels with badges 2021-10-28 17:41:40 +11:00
Oliver
c4fd9b7177 Fixes for part "card" view 2021-10-28 17:16:32 +11:00
Oliver
0ef0c539a7 Update bootstrap-table 2021-10-28 13:03:47 +11:00
Oliver
05d350b6c8 Tweaks for settings pages 2021-10-28 12:38:33 +11:00
Oliver
ae2c3e8293 remove "panel-inventree" references 2021-10-28 08:31:36 +11:00
Oliver
e235e5adec Replace "panel-body" with "panel-content" 2021-10-27 23:09:14 +11:00
Oliver
711b3ba923 remove "panel-default" 2021-10-27 23:08:15 +11:00
Oliver
53c579c992 Refactor PO and SO pages 2021-10-27 23:03:08 +11:00
Oliver
fe25ce8cd1 Refactor "manufacturer_part" view 2021-10-27 22:52:11 +11:00
Oliver
8fdaab233c Refactor build page 2021-10-27 22:44:33 +11:00
Oliver
a004f293ff Replace all instances of data-toggle with data-bs-toggle 2021-10-27 22:06:30 +11:00
Oliver
e178a2c370 Refactoring for "stock" pages 2021-10-27 21:50:18 +11:00
Oliver
9df9aaa18f breadcrumbs 2021-10-27 20:17:37 +11:00
Oliver
219191eb6a Updates for modal forms:
- Fix css classes
2021-10-27 16:48:45 +11:00
Oliver
abf2093ab9 Adds user option to enable "sticky header" 2021-10-27 16:26:41 +11:00
Oliver
827ff0f58b Modal forms fixes
- Update bootstrap classes and terminology
- Visual tweaks to modal form title block
2021-10-27 16:26:28 +11:00
Oliver
1e31774ce7 Working on navbar 2021-10-27 15:48:42 +11:00
Oliver
c6ceea4d45 Remove reliance on "bootstrap-toggle" library
- Still needs fixing in modal forms
2021-10-27 09:37:07 +11:00
Oliver
3a4022b259 Add files for bootstrap v5.1.3 2021-10-27 08:04:34 +11:00
Oliver
75845ce1ca Merge branch 'master' into partial-shipment 2021-10-27 01:05:55 +11:00
Oliver
96be11edd4 Add 'status' field to shipment table
- Is not yet implemented in the db model
2021-10-27 01:05:10 +11:00
Oliver
2eb93b5a49 Add functionality to create a new sales order shipment
- From the "New Shipment" button
- As a secondary modal from the stock allocation dialgo
2021-10-27 00:57:47 +11:00
Oliver
4d0f905afc Auto-fill the "quantity" field for the salesorder allocation table 2021-10-27 00:47:15 +11:00
Oliver
7252b299f7 Add modal API form to allocate stock items against a SalesOrder
- Added model renderer for SalesOrderShipment
- Some refactorin'
2021-10-27 00:41:12 +11:00
Oliver
b35ce79d6a js linting fix 2021-10-26 08:00:28 +11:00
Oliver
cbbad98fea Improve client-side validation of numerical inputs 2021-10-26 07:52:29 +11:00
Oliver
2d910022ac Fix for supplier price breaks
- Make "price" field an InvenTreeMoneySerializer instance
- Add client-side validation for number inputs
2021-10-26 01:55:41 +11:00
Oliver
e7c25126a4 Construct table of "shipments" 2021-10-26 00:17:17 +11:00
Oliver
ce5b47460a Added data migration for existing SalesOrder instances
- If a SalesOrder is "PENDING" or there are allocations available, a shipment is created
2021-10-25 22:35:27 +11:00
Oliver
65b673b2bb Improve pricing rendering for purchase order table 2021-10-24 19:43:05 +11:00
Oliver
bc596c1f20 Improve rendering of pricing in sale order table 2021-10-24 19:40:32 +11:00
Oliver
a0140dc9a2 bug fix: enable "table reload" for tables without any filters
- setupFilterList function was returning too early
2021-10-24 19:35:15 +11:00
Matthias Mair
31a8ee7302
Merge branch 'inventree:master' into plugin-2037 2021-10-20 23:52:51 +02:00
Oliver
d3b1ecd65e Add "owner" field 2021-10-20 23:44:01 +11:00
Oliver
f83dc134ef linting 2021-10-20 23:20:43 +11:00
Oliver
8805b0a553 Add similar auto field capabilities to build order 2021-10-20 23:14:52 +11:00
Oliver
92568748cf Further improvements
- Add callback for when a select2 form field is updated
- Adjust selected quantity based on returned data
- auto_fill the stock_item field
2021-10-20 23:03:03 +11:00
Oliver
f7b6c68237 Pre-fill the form with the remaining allocation quantity 2021-10-20 22:37:54 +11:00
Oliver
4a0ed4b2a1 Start of API forms for stock item 2021-10-20 10:53:21 +11:00
Matthias
1c93a126ae
Revert "remove url load setting for plugin"
This reverts commit e37477eb15.
2021-10-19 21:39:58 +02:00
Matthias
e37477eb15
remove url load setting for plugin 2021-10-19 19:54:20 +02:00
Oliver
60771a74a4 "InvenTree Settings" > "Global Settings" 2021-10-19 11:00:32 +11:00
Oliver
a3b3bdc88b Add some more icons to the settings page 2021-10-19 10:59:52 +11:00
Oliver
4de3bed342 UI tweaks 2021-10-18 22:19:54 +11:00
Oliver
5802a27fe7 Add a per-user setting to enable display of stock in search results 2021-10-18 16:23:42 +11:00
Oliver
4bb0b725da JS cleanup 2021-10-18 15:51:50 +11:00
Oliver
ce921a6774 Display stock level in quick search bar 2021-10-18 15:40:00 +11:00
Oliver
68cfd8615e Improvements to "grid view" for parts list
- Display 5 tiles per line
- Reduce padding
- Add border
2021-10-18 12:19:16 +11:00
Matthias
487ac594bb
testing save navigation checks 2021-10-17 19:50:06 +02:00
Oliver
fb6f15f462 Delete a bunch of old template files 2021-10-17 22:57:15 +11:00
Oliver
7c5c1b6696 typo fix 2021-10-17 21:55:33 +11:00
Oliver
02f4f0fd15 js linting fixes 2021-10-17 21:50:18 +11:00
Oliver
542b4113a1 Improvements for build output completion
- Check if the output is fully allocated (throw error if not)
- Reload tables after actions performed
2021-10-17 21:37:10 +11:00
Oliver
bd7fef720d Enable "allocate" button only once the sub-table is expanded 2021-10-17 21:13:07 +11:00
Oliver
90625af39d Re-enable the "allocate" stock button 2021-10-17 11:34:44 +11:00
Oliver
6c1dad8d91 Consolidate javascript for sidenavs 2021-10-17 11:26:08 +11:00
Oliver
9d2273c1cd Further work on build output scripts 2021-10-17 11:25:53 +11:00
Matthias
81b2a1e9c9
fix warning block 2021-10-16 17:52:58 +02:00
Matthias
9ac6bf26e5
added warning 2021-10-16 17:50:30 +02:00
Matthias
99e4b6f6a5
settting to control app loading 2021-10-16 17:47:05 +02:00
Oliver
14ef56785e Add option to select multiple build outputs
- Can "complete" these outputs
2021-10-16 14:27:02 +11:00
Oliver
d47b32e4aa Adds function to complete multiple build outputs via the API 2021-10-16 14:08:53 +11:00
Oliver
ccaa7d2683 Merge branch 'master' into build-output-complete 2021-10-16 13:18:35 +11:00
Matthias
c16c26c496
setting to control plugin settings ingestion 2021-10-16 04:17:48 +02:00
Oliver
41e59e5311 Right align expand buttons 2021-10-16 13:01:19 +11:00
Matthias
952e7e4554
add url setting 2021-10-16 00:34:15 +02:00
Matthias
41ce66df6e
add navigation setting 2021-10-16 00:32:48 +02:00
Matthias
32122102e6
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-15 23:36:19 +02:00
Oliver
744befcc96
Merge pull request #2161 from matmair/onboarding-group
Onboarding group
2021-10-15 12:55:55 +11:00
Oliver
8e4deaa8c8 Standardize spelling of email / e-mail
(Spoiler: I chose "email")
2021-10-15 11:52:13 +11:00
Matthias
3a586af556
move setting to better fit grouping 2021-10-14 21:27:41 +02:00
Matthias
b26bf780c3
setting to register group on signup 2021-10-14 21:27:09 +02:00
Oliver
4702c6b37f Refactorin' 2021-10-15 00:25:36 +11:00
Oliver
0d49513092 Add button callbacks for top-level table 2021-10-14 23:58:03 +11:00
Oliver
bf47b57c82 working on updating build output tables 2021-10-14 23:46:21 +11:00
Oliver
54dd05a24d Add an API serializer to complete build outputs 2021-10-14 23:13:01 +11:00
Oliver
4327cbedce Remove debug message 2021-10-14 18:01:16 +11:00
Oliver
9b00ede61a Add part queryset filtering to exclude particular ID values 2021-10-14 17:12:08 +11:00
Oliver
0c60387626 Extract a list of existing substitute parts from the form 2021-10-14 16:50:56 +11:00
Oliver
05791a8efd
Merge pull request #2138 from rocheparadox/master
Custom name format for parts - FR InvenTree#2085
2021-10-14 16:03:58 +11:00
Oliver
44b4061d7d Fix table filtering bug
- Introduced in recent "BOM substitutes" PR
2021-10-14 11:56:26 +11:00
Oliver
7dfffcd5d3 Move "build unallocate" functionality to the API
- Much much simpler now!
- Filtering is against bom_item, not part
- Fixes a bug with the new (reasonably complex) substitution framework
2021-10-14 10:32:43 +11:00
Oliver
1cbce5dfbf javascript fixes 2021-10-14 09:14:31 +11:00
Oliver
890741ef5d Display badge indicating variant stock can be used 2021-10-13 23:57:50 +11:00
Oliver
be5c5496b2 Improvements to allocation of stock items against build orders
- Refactor functions for filtering stock using bom_item pk
- Allow selection of substitute items when allocating against build order
- Improvements for modal rendering
- Don't display filter drop-down if there are no filters available
2021-10-13 23:53:35 +11:00
Oliver
0f8c279aa2 Add some unit testing for the new model 2021-10-13 22:27:10 +11:00
Oliver
8512c2db75 Reload the parent table when adding or removing substitutes 2021-10-13 22:06:51 +11:00
Oliver
ea4c4c514f Add uniqueness checking for the BomItemSubstitute model 2021-10-13 22:01:32 +11:00
Oliver
0e1e8226b1 Add a callback to remove individual rows 2021-10-13 21:42:50 +11:00
Oliver
8b41e68e6b Launch a dialog displaying the available BOM substitutes 2021-10-13 21:33:41 +11:00
Oliver
6803f3cf63 Display "substitutes available" icon 2021-10-13 20:36:31 +11:00
rocheparadox
294011a973 Merge remote-tracking branch 'upstream/master' 2021-10-13 10:10:59 +05:30
Oliver
f3f41730be Add "substitutes" column to BOM table 2021-10-13 11:58:40 +11:00
Oliver
4f985ae225 Revert 1fb76b9
Removes global functions to enable / disable entire sections of functionality
2021-10-13 09:40:17 +11:00
Matthias
9aaf4c25e1
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-12 22:23:45 +02:00
rocheparadox
2bf51b0ac3 Added PART_NAME_FORMAT to Inventree settings and exposed the same in settings window with a validator 2021-10-12 19:06:23 +05:30
rocheparadox
beadfb4659 Merge remote-tracking branch 'upstream/master' 2021-10-11 22:29:01 +05:30
rocheparadox
2d77b21a4e PART_NAME_FORMAT is introduced to display the names of parts in custom format. - For Feature Request InvenTree#2085
full_name construction in part.js is obsolete/redundant since the same is constructed in backend and sent through api response
2021-10-11 22:21:12 +05:30
Oliver
19a8c712d4
Merge pull request #2017 from matmair/fr-1421-sso
SSO!
2021-10-11 17:20:08 +11:00
Oliver
d3e5bc3141
Merge pull request #2132 from SchrodingersGat/esc-forms
Adds setting to close forms using escape key
2021-10-11 11:41:56 +11:00
Oliver
49601d2b7e
Merge pull request #2130 from SchrodingersGat/links-fix
Fix various documentation links
2021-10-11 11:23:53 +11:00
Oliver
f978924c4e Adds required tabindex 2021-10-11 11:23:35 +11:00
Oliver
25031e09e4 Enable setting for legacy launchModalForm function 2021-10-11 11:22:17 +11:00
Oliver
a32b5fdd64 Adds setting to close forms using escape key
- Configurable per user
- Default = false (to preserve behavior)
2021-10-11 11:16:33 +11:00
Oliver
8d33ee6298
Merge pull request #2129 from SchrodingersGat/sub-part-from-bom
Add option to BomItem form to create a new part
2021-10-11 10:59:30 +11:00
Oliver
c7bfce4a64 Fix various documentation links
- Reference the configured docs verrsion
2021-10-11 10:53:49 +11:00
Oliver
ede4ac9219 Add option to BomItem form to create a new part 2021-10-11 10:40:03 +11:00
Oliver
00275d61eb Auto-focus on the 'sub_part' field 2021-10-11 10:25:36 +11:00
Matthias Mair
848a72604e
Merge branch 'inventree:master' into fr-1421-sso 2021-10-08 22:38:16 +02:00
Matthias
9facef6a56
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-10-08 22:21:11 +02:00
Oliver
77c6e5e57e Update display of BOM table based on the configurable setting 2021-10-08 12:47:51 +11:00
Oliver
69d932e193 Add a global setting to control price display in BOM tables 2021-10-08 12:47:27 +11:00
Matthias
fe7ab40b48
Merge branch 'master' of https://github.com/inventree/InvenTree into fr-1421-sso 2021-10-07 18:12:25 +02:00
Matthias
68f5af26b6
dont show mail functions if not enabled 2021-10-07 18:08:55 +02:00
Matthias
a45b8dcf0e
check also here if mail is enabled 2021-10-07 17:50:36 +02:00
Matthias
c37e40d144
use tag for testing 2021-10-07 17:31:18 +02:00
Oliver
64cf916c50 Add a form to select export format 2021-10-07 13:33:10 +11:00
Oliver
31665e3b8d Enable editing of "sales order" from build order
- Add a renderer for the sales order model
2021-10-07 10:45:14 +11:00
Oliver
d9fddf64f1 Make this setting a per-user setting 2021-10-06 22:22:20 +11:00
Oliver
166af3592d Add optional display of part stock quantity in forms 2021-10-06 22:12:59 +11:00
Oliver
a8388b0999 JS linting 2021-10-06 20:35:51 +11:00
Oliver
5cdf5a2670 Only include "in stocK" field if the sales order is pending 2021-10-06 20:16:59 +11:00
Matthias
f07df107a9
only show if info present 2021-10-06 10:56:21 +02:00