2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-08 00:08:49 +00:00

1802 Commits

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