inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-10 17:20:32 +00:00
Code Activity
14,126 Commits 7 Branches 121 Tags
fdaf6d3e19d178b89003dd422efff91ca6aadb75
Commit Graph

14126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
0e9ea1be0c Update CONTRIBUTING.md 2022-05-25 19:58:14 +10:00
Oliver
2378073c61 SalesOrderShipment improvements (#3058) 
* Adds two new fields to SalesOrderShipment model:

- Invoice number (char)
- Link (URL)

* Bump API version

* Update API / serializer / JS

- Allow entry of new fields at time of shipping

* PEP fixes

* Actually fix the PEP issues

* Unit testing: check some more fields
 2022-05-25 11:00:19 +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
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