Commit Graph

10244 Commits

Author SHA1 Message Date
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
5eccc828fa Revert "Re-add package.json"
This reverts commit 9a9f3118ed.
2021-12-02 20:59:26 +11:00
Oliver
9a9f3118ed Re-add package.json 2021-12-02 20:53:07 +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
Oliver
8c6b82d2c0
Merge pull request #2405 from SchrodingersGat/jump-to-sn
Jump to sn
2021-12-02 16:26:21 +11:00
Oliver
e96ff7fbba Add lookup-by-sn on part page, too 2021-12-02 16:01:28 +11:00
Oliver
98bbee8159 Adds function to lookup stock item by serial number 2021-12-02 15:55:00 +11:00
Oliver
bae0495ff4
Merge pull request #2404 from matmair/matmair/issue2403
Add MPN to search
2021-12-02 11:55:24 +11:00
Oliver
514d5662ea Serial number button CSS tweaks 2021-12-02 11:02:17 +11:00
Matthias
3bff676047
beginner mistake
it is a referenced part so use related_name as prefix
2021-12-02 00:24:36 +01:00
Matthias
8c3b4badfb
and cleanup again 2021-12-02 00:08:46 +01:00
Matthias
95fa34f797
search by MPN
Fixes #2403
2021-12-01 23:56:31 +01:00
Matthias
413968a979
load minified js 2021-12-01 22:28:43 +01:00
Oliver
0cb66a45ae
Translations merge (#2395)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2021-12-01 09:20:11 +11:00
Oliver
a6fe5e0d80
Merge pull request #2388 from SchrodingersGat/part-details-refactor
Part details refactor
2021-12-01 08:47:29 +11:00
Oliver
a02e170ed1
Merge pull request #2394 from SchrodingersGat/strftime-fix
Handle case where issue_date is not set
2021-12-01 08:47:20 +11:00
Oliver
713549fe6a Handle case where issue_date is not set 2021-12-01 08:14:49 +11: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
c01c0b0e25 Refactor company buttons 2021-11-30 21:13:55 +11:00
Oliver
91c8d9fee3 Refactor stock item view 2021-11-30 20:59:37 +11:00
Oliver
e88ea8d157 Refactor supplier part display 2021-11-30 20:53:01 +11:00
Oliver
1ce1710c50 Refactor manufacturer part display 2021-11-30 20:49:52 +11:00
Oliver
defe80e2af Refactor build order display 2021-11-30 20:45:18 +11:00
Oliver
fd02197851 Refactor purchase order page 2021-11-30 20:39:28 +11:00
Oliver
7b43e3e585 Refactor sales order page 2021-11-30 20:33:41 +11:00
Oliver
64abe1e889 Refactoring "company" view 2021-11-30 20:31:05 +11:00
Oliver
440436c70d Refactor display for "part category" 2021-11-30 20:00:26 +11:00
Oliver
3aad2eb13d Refactor title card for "location" view 2021-11-30 19:57:07 +11:00
Oliver
5049f17d0b Save toggle state to session 2021-11-30 19:49:04 +11:00
Oliver
a2d912d374 Bootstrappy collapse 2021-11-30 19:45:37 +11:00
Oliver
b34b3c6d85 Place part details below main part display tab 2021-11-30 19:38:48 +11:00
Oliver
684dce9a3e
Merge pull request #2387 from SchrodingersGat/po-table-fix
Don't be dull, check for null
2021-11-30 15:59:35 +11:00
Oliver
6e9937e0e9 Don't be dull, check for null 2021-11-30 15:24:19 +11:00
Oliver
bce69b7733 Removes ship_order function 2021-11-30 00:45:40 +11:00
Oliver
6963503d02 Delete old SalesOrderShip view 2021-11-30 00:44:42 +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
c6b11b5e38 New logic for completing a SalesOrderShipment 2021-11-29 23:11:21 +11:00
Oliver
da6c723184 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/order/serializers.py
2021-11-29 22:59:36 +11:00
Oliver
820ca62a98
Merge pull request #2376 from SchrodingersGat/ui-tweaks
Small UI tweaks for "sessions" view
2021-11-29 08:11:08 +11:00
Oliver
7b339b35cc Small UI tweaks for "sessions" view 2021-11-29 07:46:37 +11:00
Oliver
cbc3089525
Merge pull request #2371 from matmair/matmair/issue2327
[FR] User sessions
2021-11-29 07:32:18 +11:00
Matthias Mair
b687659ddd
Merge branch 'inventree:master' into matmair/issue2327 2021-11-28 17:26:19 +01:00
Matthias
a06d91d9a3
fix reference name 2021-11-28 17:21:54 +01:00
Matthias
9454b51866
fix rules 2021-11-28 17:18:46 +01:00
Matthias
5f685f3c2a
fix db sessions in import / export 2021-11-28 16:54:11 +01:00
Matthias
ace4370ee9
add ruleset 2021-11-28 16:50:34 +01:00
Oliver
fa582dec8c
Merge pull request #2373 from SchrodingersGat/attachment-links
Attachment links
2021-11-28 23:01:00 +11:00