Commit Graph

11067 Commits

Author SHA1 Message Date
Matthias
972f93f6d8
always return a number 2021-12-29 15:53:04 +01:00
Matthias
624b16a419
fix pep style 2021-12-29 15:51:44 +01:00
Matthias
1eb9b395bc
more complicated tests 2021-12-29 15:43:34 +01:00
Matthias
b1188be019
fix test assertations 2021-12-29 15:34:03 +01:00
Matthias
a745aa500e
replace must be str 2021-12-29 03:02:43 +01:00
Matthias
2ec41b02f8
append information about next serial numbe to fnc call
Fixes #2484
2021-12-29 03:01:52 +01:00
Matthias
1d0aa900e8
add helper fnc to get latest SN as int 2021-12-29 02:50:23 +01:00
Matthias
771f3d6b7b
add fnc for new matcher 2021-12-29 02:38:32 +01:00
Matthias
7ef0e7941e
expand tests
TDD for the win?
2021-12-29 02:24:57 +01:00
Matthias
750e3297cc
expand docstring 2021-12-29 02:24:13 +01:00
Matthias
c9f0528dfc
append api call 2021-12-29 02:24:00 +01:00
Matthias
f8ce23217e
simplify call 2021-12-29 02:22:10 +01:00
Oliver
597d26d3d4
Merge pull request #2452 from SchrodingersGat/bom-export-form-fixes
BOM export form fixes
2021-12-14 23:15:51 +11:00
Oliver
4805540b4c try simplifying 2021-12-14 22:52:14 +11:00
Oliver
070d01b2f4 Try with newer python 2021-12-14 22:48:44 +11:00
Oliver
51543dff21
Merge pull request #2451 from sintech/tree_improvement
Subcategory treeview improvements
2021-12-14 22:45:17 +11:00
Oliver
a9d09c7d29 Fix mysql installs for github actions 2021-12-14 19:56:34 +11:00
sintech
58364bb3b5 JS style fix 2021-12-14 11:30:09 +03:00
Oliver
967584b25a Specify mysql version 2021-12-14 17:35:36 +11:00
sintech
b6d9bc3093 Remove treeview state saving. 2021-12-13 15:51:34 +03:00
Oliver
8d4f8204ca call apt-get update in workflow scripts 2021-12-13 23:48:30 +11:00
Oliver
36026a9217 PEP fixes 2021-12-13 23:15:06 +11:00
Oliver
922b8b1c30 Fix typo
(cherry picked from commit 673a5779f9)
2021-12-13 23:12:18 +11:00
Oliver
01ce752a8c BOM export options are now han
(cherry picked from commit c797eb0703)
2021-12-13 23:12:11 +11:00
Oliver
88fc0393b7 Logic fix for boolean fields in JS forms
(cherry picked from commit 10dec7743e)
2021-12-13 23:11:56 +11:00
Oliver
d75ce451be Allow user to select file format when downloadin BOM import template
(cherry picked from commit 8030ca0bb9)
2021-12-13 23:11:42 +11:00
sintech
40f73b00ce Propagate expanded state all the way to the root 2021-12-12 19:59:18 +03:00
sintech
e9650a94f3 Do not show icons for childless categories 2021-12-12 19:57:30 +03:00
Oliver
95db82a4ea
Merge pull request #2450 from SchrodingersGat/bom-pricing-fix
Fix decimal places for money field
2021-12-12 22:51:50 +11:00
Oliver
f641a3a014
Merge pull request #2449 from inventree/dependabot/pip/django-3.2.10
Bump django from 3.2.5 to 3.2.10
2021-12-12 22:19:03 +11:00
Oliver
a2357b5b46 Fix decimal places for money field 2021-12-12 22:18:29 +11:00
dependabot[bot]
f9b1305f9c
Bump django from 3.2.5 to 3.2.10
Bumps [django](https://github.com/django/django) from 3.2.5 to 3.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.5...3.2.10)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-12 10:06:07 +00:00
Oliver
a56cf5ce49
Merge pull request #2221 from matmair/matmair/issue2201
2FA with TOTP
2021-12-12 21:04:41 +11:00
Matthias
41302398e9
managment and invoke commands to remove mfa 2021-12-11 23:07:37 +01:00
Matthias
67b3c339b9
add back button to setup screen 2021-12-11 22:10:05 +01:00
Matthias Mair
89758f28b2
Merge branch 'inventree:master' into matmair/issue2201 2021-12-11 00:08:29 +01:00
Oliver
dfd7a439a6
Merge pull request #2445 from SchrodingersGat/issue2250
Issue2250
2021-12-11 09:15:37 +11:00
Oliver
c35971c524
Merge pull request #2448 from SchrodingersGat/build-allocation-fixes
Correctly allow "inherited" BOM items to be allocated to a build order
2021-12-11 08:10:26 +11:00
Oliver
438bbb5c03
Translation merge (#2447)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-12-11 01:11:27 +11:00
Oliver
05abe40978
Merge pull request #2446 from SchrodingersGat/so-allocation-quantity
Calculate how many items to assign to sales order
2021-12-11 01:08:21 +11:00
Oliver
1dafa040f9 Move 'quantity' field 2021-12-11 01:08:18 +11:00
Oliver
d573668f81 Correctly allow "inherited" BOM items to be allocated to a build order
- Some back-end logic was not running correctly
2021-12-11 01:05:19 +11:00
Oliver
e1a5192604 Calculate how many items to assign to sales order
- Do not over-allocate by default
2021-12-11 00:45:53 +11:00
Oliver
b908aa2467 fix js linting issues 2021-12-11 00:33:16 +11:00
Oliver
9e16989c91 Add same breadcrumb tree for StockLocation and StockItem 2021-12-11 00:25:59 +11:00
Oliver
e9ae3eb01d Revert to bootstrap-treeview
- More "bootstrappy" design
- Already in code base
- Cleaner API
2021-12-11 00:25:44 +11:00
Oliver
3bc3ff493a CSS tweaks 2021-12-10 22:53:24 +11:00
Oliver
7dcd166d50 Change "sidetree" to "breadcrumb-tree" 2021-12-10 22:53:19 +11:00
Oliver
8c018cf987 Add href to nav toggle (so mouse cursor changes) 2021-12-10 22:31:50 +11:00
Oliver
ffe970d139 Move "sidetree" to underneath breadcrumbs 2021-12-10 22:31:11 +11:00