2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 12:33:33 +00:00
Commit Graph

14853 Commits

Author SHA1 Message Date
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
Oliver c9d4268c34 Merge pull request #3000 from matmair/devOps
DevOps improvements
2022-05-20 13:55:57 +10:00
Matthias Mair e1abdddc4a Merge branch 'inventree:master' into not-working-tests 2022-05-20 00:28:35 +02:00
Matthias b87f44dbfc skip css if not available 2022-05-20 00:10:41 +02:00
Matthias Mair fe4cbe0ad9 Merge branch 'master' into devOps 2022-05-19 18:28:15 +02:00
Oliver 8385080e4c Merge pull request #3036 from maksimstojkovic/auto-reload-so
Primitive solution to SO reload on shipment
2022-05-19 21:16:24 +10:00
Maksim Stojkovic d9beaab92c Primitive solution to SO reload on shipment 2022-05-19 20:31:55 +10:00
Oliver 90235a2bb1 Merge pull request #3035 from SchrodingersGat/setting-unit-tests
Expand unit tests for settings
2022-05-19 20:23:18 +10:00
Oliver Walters e93b138de4 Expand unit tests for settings
- Check that name and description are translated
- Check for only allowed keys
- Extend checks to include user settings
- Check default value for boolean setting
2022-05-19 19:49:39 +10:00
Matthias Mair eac6456949 Update tasks.py 2022-05-19 08:04:20 +02:00
Matthias Mair dfaf7bcad8 Add static into apps 2022-05-19 07:57:45 +02:00