Commit Graph

1765 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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