inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 12:33:33 +00:00
Code Activity
13,435 Commits 11 Branches 155 Tags
f9aa5a60fdfe9de9869b8f50c6fa9d739ad2ae05
Commit Graph

13435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver f9aa5a60fd Override 2FA token removal form (#3240) 
- Requires user to input valid token to remove 2FA for their account

Co-authored-by: Matthias Mair <code@mjmair.com>
 2022-06-23 13:04:53 +10:00
Oliver b9c6cd70d4 Enable "sanitize" option for EasyMDE editor (#3206) 
* Enable "sanitize" option for EasyMDE editor

* Bump version number
0.7.3 		2022-06-16 13:31:20 +10:00
Oliver 26bf51c20a Back porting of security patches (#3197) 
* Merge pull request from GHSA-fr2w-mp56-g4xp

* Enforce file download for attachments table(s)

* Enforce file download for attachment in 'StockItemTestResult' table

(cherry picked from commit 76aa3a75f2)

* Merge pull request from GHSA-7rq4-qcpw-74gq

* Merge pull request from GHSA-rm89-9g65-4ffr

* Enable HTML escaping for all tables by default

* Enable HTML escaping for all tables by default

* Adds automatic escaping for bootstrap tables where custom formatter function is specified

- Intercept the row data *before* it is provided to the renderer function
- Adds a function for sanitizing nested data structure

* Sanitize form data before processing

(cherry picked from commit cd418d6948)

* Increment version number for release

* Fix sanitization for array case - was missing a return value
0.7.2 		2022-06-15 20:43:43 +10:00
Oliver f9c28eedaf Add error handling for case where user does not have git installed (#3179) (#3198) 
(cherry picked from commit 5ecba6b13c)
 2022-06-15 18:52:10 +10:00
Oliver 9bdbb0137f Adds release.yml file for auto-generation of release notes (#3194) 2022-06-14 20:30:09 +10:00
Oliver 412b464b09 Prevent auto-creation of SalesOrderShipment if we are importing data (#3170) 
- Fixes a bug which prevents importing of datasets
 2022-06-10 11:26:16 +10:00
Oliver f48bd62534 Bump version number 0.7.1 2022-06-02 16:35:00 +10:00
Oliver bd92ff1290 Fix filtering for purchaseorder table on supplierpart page (#3115) 2022-06-02 14:25:28 +10:00
Oliver 3b3238f762 Check user permissions before performing search (#3083) 
* Check user permissions before performing search

* JS linting

(cherry picked from commit 6c7a80c141)
 2022-05-27 13:27:28 +10:00
Oliver 81d29efc12 Improve error management for order price calculation (#3075) 
* Improve error management for order price calculation

- If there are missing exchange rates, it throws an error
- Very much an edge case

* Style fixes

* Add warning message if total order price cannot be calculated

* price -> cost

(cherry picked from commit 640a5d0f24)
 2022-05-27 13:27:22 +10:00
Oliver Walters 044315afbe Bump version number 0.7.0 2022-05-24 20:33:48 +10:00
Oliver 063375557f L10 crowdin (#3063) 
* 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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
v0.7.0 		2022-05-24 20:29:17 +10:00
Oliver ea9f2f81f1 Stock available (#3057) 
* Fix display of stock labels

- If 'shipped' or 'installed', don't display 'allocated' flag

* Switch stock item data around

* Add 'available' and 'allocation' information to the StockItem detail page

- Cache some context data to the view renderer

* Stock table now also displays allocation informatoin
 2022-05-24 15:35:04 +10:00
Matthias Mair 1c6e5f0f20 More plugin testing (#3052) 
* Add a check of a child panel too

* do not cover error catching

* test for implementation error

* Add warning to test for

* Add test for event_sample

* ignore safety switches

* Add a settings flag to enable event testing

* test if not implemented is raises

* raise plugin specific errors

* use plugin specific error

* fix assertation

* add test for mixin

* this point can't be reached

* add tests for locate plugin

* fix assertations

* fix function call

* refert switch

* this is already caught by the internal API

* also cover mixin redirect
 2022-05-24 09:23:06 +10:00
Matthias Mair a7ef560ee3 remove dead code (#3054) 
no references are found in the code
 2022-05-24 09:20:59 +10:00
Oliver c0b74e18ac L10 crowdin (#3051) 
* 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

* 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

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2022-05-23 14:07:08 +10:00
Oliver 3c02b95f85 Shipment date edit (#3050) 
* Allow user to select shipment date when shipping a salesorder

- Defaults to 'today'

* Retain the tracking number information through the from

* JS linting

* Add unit testing for the SalesOrderShipmentComplete serializer / API endpoint
 2022-05-23 13:57:40 +10:00
Matthias Mair 840ade25cd Label printing unit test (#3047) 
* Adds a very simple sample plugin for label printing

* Test mixin install status and API query

* Better error reporting for label printing API

* pep fixes

* fix assertation

* remove broken assertation

* igonre for coverage

* test the base process of printing

* refactor tests

* clean up basic test

* refactor url

* fix url creation

* test printing multiples

* test all printing endpoints

* test all list options - move api tests

* test for invalid filters

* refactor

* test with no part

* these should not happen
checks are in place upstream

* fix assertation

* do not cover continue parts

* test for wrong implementation

* ignore DB not ready

* remove covage from default parts

* fix url generation

* test debug mode

* fix url assertation

* check that nothing was rendered

Co-authored-by: Oliver Walters <oliver.henry.walters@gmail.com>
 2022-05-23 08:54:44 +10:00
Matthias Mair 6247eecf69 Exclude testing exceptions from coverage (#3046) 
* exclude testing excetions

* check user str

* check related users

* move no coverage marker

* fix assertation

* add test for filters

* do not cover logs
 2022-05-22 15:54:13 +10:00
Maksim Stojkovic 0ec067da40 [Feature] Shipment Creation in Stock Allocation Modal (#3024) 
* Added order reference to line item options

* Basic working version implemented

* Re-execute fields function in secondary modals

* Added missing argument and parameter

* Added missing parentheses

* Fixed hidden field name for depth > 0
 2022-05-22 09:34:38 +10:00
Oliver 40153b94a5 L10 crowdin (#3045) 
* 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

* 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

* 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

* 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>
 2022-05-22 09:18:07 +10:00
Oliver c2b2896f45 Merge pull request #3041 from matmair/style-fixes 
Style fixes
 2022-05-22 08:39:09 +10:00
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