Commit Graph

13463 Commits

Author SHA1 Message Date
Matthias Mair
5805685c48 Merge branch 'master' of https://github.com/inventree/InvenTree into style-fixes 2022-05-21 23:57:41 +02:00
Oliver
624a6ebb6c
Merge pull request #3043 from maksimstojkovic/fr-2986-shipment-page-action
Complete Allocated Pending Orders from SO Page Actions Menu
2022-05-21 23:45:29 +10:00
Oliver
8eaf172512
Merge pull request #3040 from matmair/test-simplify
Test simplify
2022-05-21 19:41:23 +10:00
Matthias Mair
22adc37242 fix import 2022-05-21 02:40:45 +02:00
Oliver
5a760e5ad3
Merge pull request #3044 from matmair/fix-test-cfg-file
[BUG] Remove repo name from assertation
2022-05-21 07:39:18 +10:00
Matthias Mair
e1ff4b6e87 more class use 2022-05-20 23:01:20 +02:00
Matthias Mair
43f714b96c use variable for values and up the all 2022-05-20 19:57:13 +02:00
Matthias Mair
9af0b981e7 fix class to enable userlogin 2022-05-20 19:14:35 +02:00
Matthias Mair
6ef8c3dc83 run as admin 2022-05-20 19:11:21 +02:00
Matthias Mair
b7a501f42c log out first 2022-05-20 19:09:51 +02:00
Matthias Mair
43a2442f02 add usermodel back in 2022-05-20 18:53:33 +02:00
Matthias Mair
556b7036aa remove repo name from assertations
this breaks on other runners (gitlab, azure devops) as they handle repo names in another way
2022-05-20 18:42:41 +02:00
Matthias Mair
9b15d88d5f fix rule assign 2022-05-20 18:34:45 +02:00
Matthias Mair
45a9a4d0c5 add in missing class references 2022-05-20 17:55:11 +02:00
Matthias Mair
799af89312 style fixes 2022-05-20 17:45:04 +02:00
Matthias Mair
a148dbf303 refactor 'all' role 2022-05-20 17:43:51 +02:00
Maksim Stojkovic
f036252fb9 Added completePendingShipments to exported section 2022-05-21 01:31:01 +10:00
Matthias Mair
c50456297e fix assertation 2022-05-20 17:27:08 +02:00
Matthias Mair
4868947be0 remove comments from imports 2022-05-20 17:25:50 +02:00
Matthias Mair
e1d22f538d resort imports 2022-05-20 17:24:51 +02:00
Maksim Stojkovic
ac35bd8073
Merge branch 'inventree:master' into fr-2986-shipment-page-action 2022-05-21 01:06:58 +10:00
Maksim Stojkovic
c38862b28c Added page action to process pending shipments 2022-05-21 01:05:54 +10:00
Maksim Stojkovic
3eb4898019 Added support for secondary buttons on modals
Secondary buttons can be added to modal footers beside Close and Submit
Buttons can be linked to callback functions
Callback functions can access options arguments passed to constructForm
2022-05-21 00:52:45 +10:00
Maksim Stojkovic
f1ca9d7aa8 Added div for extra secondary modal buttons 2022-05-20 22:22:49 +10:00
Matthias Mair
ddc4ef3c38 pep fix 2022-05-20 13:37:12 +02:00
Matthias Mair
74726f0fda fix endline 2022-05-20 13:35:07 +02:00
Matthias Mair
93b6934127 fix trailing 2022-05-20 13:20:55 +02:00
Matthias Mair
9f922f06ff fix more imports 2022-05-20 12:53:04 +02:00
Matthias Mair
a6f7a29817 fix import path 2022-05-20 12:48:03 +02:00
Oliver
bd195105e7
Merge pull request #2991 from matmair/not-working-tests
Static test fixes
2022-05-20 20:46:28 +10:00
Matthias Mair
04ce4fa697 readd config 2022-05-20 12:38:15 +02:00
Maksim Stojkovic
b99a9306ce Added onSuccess support to completeShipment 2022-05-20 20:37:23 +10:00
Matthias Mair
e8287f02d4 rename 2022-05-20 12:33:51 +02:00
Matthias Mair
42d325e7ca fix spelling 2022-05-20 12:33:28 +02:00
Matthias Mair
3a1996dd48 PEP fix 2022-05-20 12:32:25 +02:00
Matthias Mair
023ff3c85a Merge branch 'master' of https://github.com/inventree/InvenTree into test-simplify 2022-05-20 12:13:31 +02:00
Matthias Mair
0d5dea3e6d refactor test setup 2022-05-20 12:12:32 +02:00
Maksim Stojkovic
af0901d06c Changed complete shipments button to always show 2022-05-20 19:30:19 +10:00
Oliver
620dca09a4
Merge pull request #3038 from SchrodingersGat/search-results-fix
Search Results Fix
2022-05-20 18:36:23 +10:00
Maksim Stojkovic
c6b9585c02 Fixed typo 2022-05-20 18:28:02 +10:00
Oliver
cc59ef65fc PEP fixes 2022-05-20 17:31:08 +10:00
Oliver
33bab19abb Better reporting of settings errors 2022-05-20 17:29:18 +10:00
Oliver
8da278a072 Adds option to hide unavailable stock items from the search preview window 2022-05-20 17:10:51 +10:00
Oliver
0f4ed55bed JS fixes 2022-05-20 17:02:28 +10:00
Oliver
8ad141f910 Add extra options to control search results in preview window
- Allow user to optionally show / hide inactive purchase orders
- Allow user to optionally show / hide inactive sales orders
2022-05-20 16:57:30 +10:00
Matthias Mair
63c64f9dff
Update apps.py 2022-05-20 08:31:21 +02:00
Maksim Stojkovic
f2a3b4ab1f Changed completeShipment reload to optional 2022-05-20 16:29:59 +10:00
Matthias Mair
c98cae8c1f
switch print with assert 2022-05-20 08:19:14 +02:00
Maksim Stojkovic
b48f8fba2b
Merge branch 'inventree:master' into fr-2986-shipment-page-action 2022-05-20 16:02:45 +10:00
Maksim Stojkovic
239138a1b5 Added page actions menu item 2022-05-20 15:01:45 +10:00