Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,203 Commits 6 Branches 99 Tags 484 MiB
985967fccb
Commit Graph

4064 Commits

Author SHA1 Message Date
eeintech
aa41e3e17d Fixed default url barcode setting 2021-04-14 16:24:24 -04:00
eeintech
1bf72ee335 Added revision and stock item URL for label creation 2021-04-14 16:00:28 -04:00
Matthias Mair
50922b1ed4 New translations django.po (German) 2021-04-14 21:59:11 +02:00
Matthias Mair
35c764036c New translations django.po (German) 2021-04-14 21:33:17 +02:00
Matthias Mair
b4003cc3e0 New translations django.po (German) 2021-04-14 16:19:06 +02:00
Matthias Mair
5ff624bf82 New translations django.po (German) 2021-04-14 13:56:23 +02:00
Matthias Mair
a4dfaa9528 New translations django.po (Spanish) 2021-04-14 13:56:22 +02:00
matmair
c8b234362f updated translation-string 2021-04-14 11:13:13 +00:00
Matthias
73bcacc2d8 added tranlation strings 2021-04-14 12:23:51 +02:00
eeintech
1e6c6c678f Split supplier part update migration and added reverse method for manufacturer data 2021-04-13 10:25:53 -04:00
eeintech
42a73576da Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-13 09:48:55 -04:00
Oliver
a8d22dac62
Merge pull request #1458 from matmair/translation_improv 
updated translation references
 2021-04-13 21:20:32 +10:00
Matthias
75a249da95 Merge branch 'master' of https://github.com/inventree/InvenTree into translation_improv 2021-04-13 13:03:58 +02:00
Matthias
71425d3bc5 updated translation references 2021-04-13 12:56:18 +02:00
Oliver Walters
d5034ece51 typo fix 2021-04-13 20:21:33 +10:00
Oliver Walters
04318c6d70 Adjust default email settings 2021-04-13 20:15:09 +10:00
Oliver Walters
96efb0eb28 Remove "forgot password" link if the email backend is not configured 2021-04-13 20:02:20 +10:00
eeintech
3eae70e745 Merged master and company migrations 2021-04-12 11:10:35 -04:00
Oliver Walters
f902b79d79 And more templates 2021-04-12 20:07:38 +10:00
Oliver Walters
12a4c22a9b Password reset templates 2021-04-12 20:02:05 +10:00
Oliver Walters
a9d490b716 PEP fixes 2021-04-12 19:20:41 +10:00
Oliver Walters
d243ff6b37 Offload email task to background worker 2021-04-12 19:18:47 +10:00
Oliver Walters
fb5a94a778 Support for email settings 2021-04-12 18:50:37 +10:00
Oliver Walters
8a06eaa40d Unit testing 2021-04-11 19:28:39 +10:00
Oliver Walters
85c9bc1b81 Adds detail endpoint for PartParameter model 2021-04-11 18:56:35 +10:00
Oliver
effd547260
Update version.py 2021-04-11 15:39:53 +10:00
Oliver
7c9ad3f406
Update version.py 2021-04-11 15:39:16 +10:00
Oliver Walters
f9449da576 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2021-04-11 15:03:33 +10:00
Oliver
34e95ab70c
Update version.py 2021-04-11 14:49:41 +10:00
Oliver Walters
f6f3815f31 Include worker status in main API call 2021-04-11 13:58:59 +10:00
Oliver Walters
b74d365529 Merge remote-tracking branch 'upstream/master' into django-q 2021-04-10 22:46:20 +10:00
Oliver Walters
91b6f98f95 Update directory structure to match docker config 2021-04-10 22:08:36 +10:00
Oliver Walters
178715ce61 Auto create config file in specified location if it does not exist 2021-04-10 20:57:56 +10:00
Oliver Walters
e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Oliver Walters
5e54b0f5cf Auto-generate key file if it does not exist! 2021-04-10 19:01:02 +10:00
Oliver Walters
e6bd91c9e2 Company description is no longer a required field 2021-04-10 15:29:44 +10:00
Oliver Walters
8eb571bddf Update dockerfile 2021-04-10 15:08:10 +10:00
Oliver
c7e1ac5648
Merge pull request #1449 from eeintech/fix_stock_ops 
Fixed transfer stock action in template
 2021-04-10 09:19:43 +10:00
Oliver
6bf3cc9e01
Merge pull request #1446 from eeintech/bom_yaml_export 
Replace normalize with integer wrapper for quantity field
 2021-04-10 09:17:23 +10:00
eeintech
6bf4140e5a Fixed transfer stock action in template 2021-04-09 16:55:05 -04:00
eeintech
afddf12339 Changed int to float 2021-04-08 22:04:26 -04:00
eeintech
97e1bc0a67 Added missing part_detail reference 2021-04-08 21:46:11 -04:00
eeintech
cbddda6640 Remove normalize import 2021-04-08 14:41:06 -04:00
eeintech
7491cda313 Replace normalize with integer wrapper for quantity field 2021-04-08 14:35:47 -04:00
eeintech
b5a5f5b409 Simplified stock table view in Part and SupplierPart detail pages 2021-04-08 13:42:35 -04:00
eeintech
f8d1ee8805 Made company description optional 2021-04-08 13:24:17 -04:00
Oliver Walters
47a93bc4cb More environment variables for config.yaml 2021-04-08 21:01:52 +10:00
Oliver Walters
3381945e14 Add newline 2021-04-08 17:10:48 +10:00
eeintech
0bb2507dd6 Added manufacturer part deletion warning when deleting a part 2021-04-07 14:02:50 -04:00
eeintech
1074300ba0 Improved BOM export of combined manufacturer and supplier data 2021-04-07 12:24:32 -04:00
eeintech
ccd35fc4b4 Fixed supplier part list bug and hide manufacturer fields in supplier part edit form 2021-04-07 11:50:11 -04:00
eeintech
c0691c3e9b Decoupled manufacturer and supplier data in BOM export, aggregate data needs more work 2021-04-07 11:43:05 -04:00
eeintech
63ade51c6c Updated migrations after merge with master 2021-04-07 10:49:19 -04:00
Oliver Walters
3926276fd1 Greatly simplified "wait_for_db" command 2021-04-08 00:37:34 +10:00
eeintech
f39928368e Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-04-07 10:33:55 -04:00
eeintech
2db6af2af6 PO table and stock item template improvements 2021-04-07 10:33:31 -04:00
Oliver Walters
71cac6e269 Simplify waiting for db 2021-04-08 00:09:51 +10:00
Oliver Walters
ed304f571a Better configuration of github repo 2021-04-08 00:05:37 +10:00
eeintech
b2264940a3 Dynamic control of information to make cleaner supplier and manufacturer tables 2021-04-07 09:54:20 -04:00
Oliver Walters
d4d9263131 Add option to specify config file via environment variable 2021-04-07 23:46:03 +10:00
Oliver Walters
9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
 2021-04-07 22:29:47 +10:00
Oliver Walters
4a3ca4638c Dockerfile updates 2021-04-07 22:27:55 +10:00
Oliver Walters
d91531720b Unit testing for task scheduling 2021-04-07 22:17:24 +10:00
Oliver
5e0e364b6c
Merge pull request #1441 from SchrodingersGat/missing-git 
Hide git information if there is an error
 2021-04-07 22:09:38 +10:00
Oliver Walters
6412cf1c87 Hide git information if there is an error 2021-04-07 20:55:44 +10:00
eeintech
734985faa9 Made manufacturer part ID dynamic for API supplier part create test 2021-04-06 14:53:35 -04:00
eeintech
52b2b9582d More tests and improved coverage (hopefully) 2021-04-06 14:30:03 -04:00
eeintech
7b4d3a3c07 Added test units for migration and API 2021-04-06 13:16:01 -04:00
Matthias
32eaf48c12 fixed styling 2021-04-06 18:33:57 +02:00
eeintech
76fe535ef9 Improved delete form to show supplier parts deletion 2021-04-06 09:32:59 -04:00
eeintech
bd65a42410 Removed global setting for manufacturer parts (enabled for all users) 2021-04-06 08:49:45 -04:00
eeintech
fd66e8b136 Added MPN link to supplier part list 2021-04-05 15:41:18 -04:00
eeintech
547dcc6e80 Deleted manufacturers tab from supplier detail page 2021-04-05 15:19:34 -04:00
eeintech
58ddc47065 Updated migration files to handle duplicate manufacturer data 2021-04-05 11:21:34 -04:00
Matthias
530b90042a added german(de) translations 2021-04-04 22:51:16 +02:00
Matthias
2c053eae4c added translations 2021-04-04 22:49:47 +02:00
Matthias
ef64d1e61d added label to DatePickerFormField 2021-04-04 22:49:17 +02:00
Matthias
adcb211572 set language in the used js scripts 2021-04-04 22:48:36 +02:00
Matthias
efd14fca64 made translation lazy 2021-04-04 22:47:01 +02:00
Matthias
20c455384e added more translation-strings 2021-04-04 22:44:14 +02:00
Matthias
c68220a597 migrations for all the translated models, totally forgot that 2021-04-03 14:11:28 +02:00
Matthias
cd7724d490 added german(de) translations for the new stuff 2021-04-03 13:48:02 +02:00
Matthias
f67210b20f added translation files for changes 2021-04-03 04:11:40 +02:00
Matthias
1854da380b made filters.js dynamic for translation 2021-04-03 04:07:27 +02:00
Matthias
0547e1c03b added more translations in html / js 2021-04-03 04:05:59 +02:00
Matthias
446bc06c1b switched translation methode to lazy 2021-04-03 04:01:40 +02:00
Matthias
2de6fcbfa4 added missing translation fields #753 2021-04-03 03:59:09 +02:00
Matthias
698b946403 activated translations for settings 2021-04-02 23:03:24 +02:00
eeintech
45ca8d0e93 Fixes to the way ManufacturerPart is saved, manufacturer table filtering and test units 2021-04-02 11:13:57 -04:00
eeintech
bb69e38c1a Simple and View test units 2021-04-01 16:30:06 -04:00
eeintech
94574b37ae Added Manufacturer parts to search, fixed icons, added manufacturer view in supplier part detail page 2021-04-01 10:00:15 -04:00
Oliver Walters
2436b1f2c9 Entrypoint script - start.sh 2021-04-02 00:40:47 +11:00
eeintech
a8b858c824 Fixed serializer 2021-04-01 09:11:47 -04:00
Oliver Walters
8d3b9e2ca4 Updates to settings.py 
- Create secret_key.txt if it does not exist
- Copy default settings file if it does not exist
 2021-04-02 00:06:17 +11:00
Oliver Walters
be41be3981 Add "wait_for_db" management command 2021-04-02 00:03:56 +11:00
eeintech
8c8b25a0d2 Validating API for SupplierPart, not able to spin-off ManufacturerPart from serialized data 2021-03-31 18:04:28 -04:00
eeintech
9e56bf90c5 More web testing, looks ready 2021-03-31 13:53:55 -04:00
eeintech
2f2e5862a9 Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-31 13:10:33 -04:00
Oliver Walters
c0a0ca4588 PEP fix 2021-03-31 22:35:48 +11:00
Oliver Walters
3f257279ee Specify directories for CI 2021-03-31 22:31:50 +11:00
Oliver Walters
731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11:00
Oliver Walters
82b6c48946 Specify database name 2021-03-31 21:48:54 +11:00
Oliver Walters
566c3af39e Environment variables take preference! 2021-03-31 21:40:19 +11:00
Oliver Walters
5d141e3568 Always print database config 2021-03-31 21:24:14 +11:00
Oliver Walters
c846e2e65a Use env variables rather than custom ci scripts 2021-03-31 20:39:22 +11:00
Oliver Walters
c66dddc03f Force TCP for postgres 2021-03-31 20:14:57 +11:00
Oliver Walters
6b99808c52 Run as root 2021-03-31 20:12:45 +11:00
Oliver Walters
61d14a0eda Database naming fix 2021-03-31 20:07:42 +11:00
Oliver Walters
5aea35f8fa Force TCP 2021-03-31 20:04:18 +11:00
Oliver Walters
70703f8588 Try localhost 2021-03-31 19:48:20 +11:00
Oliver Walters
67a4c5a9a2 Try pointing to different host 2021-03-31 19:45:58 +11:00
Oliver Walters
f8d29b7b3b Typo 2021-03-31 17:36:33 +11:00
Oliver Walters
9e4218d02f Mysql fixes 2021-03-31 17:34:12 +11:00
Oliver Walters
d09483f30c Workflow fixes 2021-03-31 17:28:30 +11:00
Oliver Walters
d1a42f55a2 Fix flake issues 2021-03-31 17:20:12 +11:00
Oliver Walters
bdd5fa96e7 Add tests for mysql and postgresql 2021-03-31 17:18:04 +11:00
Oliver Walters
4f87c848a5 Ensure flake8 fails 2021-03-31 17:17:40 +11:00
eeintech
0b1f22c7fd Almost there, needs some interface testing and tweaking 2021-03-30 18:08:33 -04:00
eeintech
9c8817d73b Fixed serializers and started update of templates 2021-03-30 16:48:16 -04:00
eeintech
811f9333e8 SupplierPart manufacturer data is not serializing 2021-03-30 13:55:20 -04:00
eeintech
a4d098194b New SupplierPart manufacturer_part field 
New migration file with database update to manufacturer parts
Removed SourceItem model
 2021-03-30 13:14:30 -04:00
eeintech
e78455085f Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-30 11:30:47 -04:00
Oliver Walters
39b2c5f943 Reintroduce default database config 2021-03-30 21:18:09 +11:00
Oliver Walters
3ddbb6a6cd Check for empty values 2021-03-30 20:53:26 +11:00
Oliver
fd01e23245
Merge pull request #1430 from SchrodingersGat/missing-permission-fix 
Emit warning rather than raise error
 2021-03-30 10:28:54 +11:00
Oliver Walters
1a288168b7 PEP fixes 2021-03-30 10:00:43 +11:00
Oliver
f288b906ad
Merge pull request #1426 from SchrodingersGat/assign-by-sn 
Assign by sn
 2021-03-30 09:29:49 +11:00
Oliver Walters
58c30f48d5 Remove extra whitespace 2021-03-30 09:28:02 +11:00
Oliver Walters
bfbdd72306 Remove unused import 2021-03-30 08:43:09 +11:00
Oliver Walters
0b78f3d931 Add unit testing for migrations 2021-03-30 08:42:44 +11:00
Oliver Walters
32cfe1b954 Emit warning rather than raise error 
- All calling functions check for None anyway
 2021-03-30 08:25:51 +11:00
Oliver Walters
408b9d5e5b Fix for unit testing 2021-03-30 08:08:55 +11:00
eeintech
50adb2ac61 SourceItem only for SupplierPart, added logic to templates 2021-03-29 15:39:25 -04:00
eeintech
e6dfb7da52 Added global setting to enable manufacturer parts 
Created SourceItem model
Updated templates
 2021-03-29 13:22:15 -04:00
eeintech
cbb887ae79 Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part 2021-03-29 10:12:20 -04:00
Oliver Walters
709bfb1bd2 Remove "unique" constraint for part / order relationship 2021-03-30 00:14:47 +11:00
Oliver Walters
217097c9d3 Add custom form template 2021-03-30 00:10:28 +11:00
Oliver Walters
19059ea4cf Tweaks 2021-03-29 23:38:38 +11:00
Oliver Walters
d64dd68403 Agk, working out forms is hard 2021-03-29 23:32:41 +11:00
Oliver Walters
bd87f4c733 Adds form to assign stock item by serial numbers 2021-03-29 23:10:36 +11:00
Oliver Walters
cffe2ba84b Add a separate form for creating a sales order allocation 2021-03-29 16:44:01 +11:00
Oliver Walters
7a4b90649a HTML / CSS fixes 2021-03-29 16:36:27 +11:00
Matthias
a3ab70b05d finished german translation, small corrections 2021-03-28 18:09:35 +02:00
Matthias
c558a04162 updated translation reference 2021-03-28 18:08:07 +02:00
Oliver
1ffd3a0070
Merge pull request #1409 from eeintech/fix_stock_ops 
Template fix for stock actions
 2021-03-28 20:42:14 +11:00
eeintech
e0a0bfdadb Fix style 2021-03-25 15:39:16 -04:00
eeintech
c85d737446 Fix CI 2021-03-25 15:04:48 -04:00
eeintech
fd4f33d45b More templates updates 2021-03-24 12:39:26 -04:00
eeintech
4abd8587ab Updated company templates 2021-03-24 12:08:45 -04:00
eeintech
afd2dacfc7 Can now create, view list of parts and view detail page 2021-03-24 11:44:51 -04:00
Oliver Walters
df0ab2359f Remove invoke tasks which perform system commands 
- tasks.py is now for InvenTree specific tasks only
 2021-03-24 22:24:47 +11:00
eeintech
e28dde7f7b Fixed navbar, added missing template and urls 2021-03-23 17:45:03 -04:00
eeintech
08ffbee8ed Fixed model name and added to part navbar 2021-03-23 17:33:29 -04:00
eeintech
8f610d826f Added URLs and templates 2021-03-23 17:16:29 -04:00
eeintech
e897864396 Added ManufacturerPart model, form and views 2021-03-23 17:01:54 -04:00
Oliver Walters
edbbfff1af Reduce frequency of heartbeat 2021-03-23 19:58:29 +11:00
Oliver Walters
8fd666e662 Improvements for "check for updates" task 
- Let it throw an error if something fails
- Errors are caught as "unsuccessful tasks"
 2021-03-22 11:20:09 +11:00
Oliver
57289fe141
Merge pull request #1410 from SchrodingersGat/image-downloader 
Image downloader
 2021-03-18 11:10:07 +11:00
Oliver Walters
9c91ba4692 Add image download functionality for company 2021-03-18 09:20:24 +11:00
Oliver Walters
4e7243b999 Add modal image overlay for company 2021-03-17 23:55:21 +11:00
Oliver Walters
e3a5a56371 Add "modal image" display for part thumbnails 2021-03-17 23:44:47 +11:00
Oliver Walters
db47629867 Cleanup 2021-03-17 23:15:48 +11:00
Oliver Walters
8b310d8e47 Check length of response 2021-03-17 23:11:38 +11:00
Oliver Walters
be30933bfa Add custom form template 2021-03-17 23:06:56 +11:00
Oliver Walters
9a710ca28f Fix image download code 2021-03-17 23:02:32 +11:00
Oliver Walters
47a1143570 Catch error when generating company thumbnail images 2021-03-17 11:55:51 +11:00
Oliver Walters
5f19f534fc Catch error if invalid image is uploaded 2021-03-17 09:47:57 +11:00
Oliver Walters
15678f789c Add global setting to enable download of files / images from remote URL 2021-03-17 08:40:30 +11:00
Oliver Walters
45edb7e802 Add button 2021-03-17 08:28:38 +11:00
Oliver Walters
5b7d35e6f7 add View 2021-03-17 08:28:28 +11:00
Oliver Walters
3900f9b1b6 Add form for submitting image URL 2021-03-17 08:28:12 +11:00
eeintech
8619af9f09 Template fix for stock actions 2021-03-16 12:32:56 -04:00
eeintech
85474516a3 Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting 2021-03-16 10:23:27 -04:00
Oliver Walters
6946abae13 CSS fix for modal error info dialog 2021-03-16 16:42:33 +11:00
Oliver
5e48009241
Merge pull request #1407 from eeintech/bom_match_headers 
Split required and part match headers for BOM import
 2021-03-16 08:19:32 +11:00
eeintech
64a57128bc Return True for BOM valid flag if part does not have BOM items 2021-03-15 10:37:30 -04:00
eeintech
d39bd88440 Split required and part match headers for BOM import 2021-03-15 09:41:04 -04:00
eeintech
7b81a470b9 Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting 2021-03-15 08:50:31 -04:00
Oliver Walters
2de879d2ba Add option to hide form error message 2021-03-15 20:30:18 +11:00
Oliver Walters
9918860820 Small tweak for breadcrumb div css 2021-03-15 17:00:14 +11:00
Oliver Walters
c6e154f996 PEP style fixes 2021-03-15 10:15:48 +11:00
Oliver Walters
c1aed51de1 Fix import error 2021-03-15 09:34:32 +11:00
Oliver Walters
24823adc6d Adds unit tests for version number comparison 2021-03-15 08:51:50 +11:00
Oliver Walters
6ea846ce45 Add a #TODO 2021-03-15 08:36:27 +11:00
Oliver Walters
f6dd710d6e Automatically delete old heartbeat messages 2021-03-15 08:35:06 +11:00
Oliver Walters
de85d61451 Directly compare version tuples, rather than converting to primitive 2021-03-15 08:31:19 +11:00
Oliver
5ff18a0a3a
Merge pull request #1403 from matmair/translations-de 
unified translation scheme
 2021-03-15 08:27:24 +11:00
Oliver
82faccc62f
Merge pull request #1401 from eeintech/stock_filter_assembly 
Stock filter for parts assemblies
 2021-03-13 07:48:15 +11:00
eeintech
acb0b2c10a Fixed build typo 2021-03-12 11:46:56 -05:00
eeintech
429f9d0a13 Removed test print 2021-03-12 11:19:20 -05:00
eeintech
89c7c87f1e Add stock filter for parts assemblies 2021-03-12 11:18:19 -05:00
eeintech
b152f7041b Add setting to disable IPN editing after part is created (web only) 2021-03-12 10:30:31 -05:00
Oliver Walters
700effcee7 Remove celery reference 2021-03-12 16:57:27 +11:00
Oliver Walters
18b559fee7 Fix for unit test 2021-03-12 16:28:54 +11:00
Oliver Walters
9d404afec0 Add 'ignore' rules for the django-q tables 2021-03-12 16:00:25 +11:00
Oliver Walters
51616c8aca Merge remote-tracking branch 'upstream/master' into django-q 2021-03-12 15:47:03 +11:00
Oliver Walters
ef4dbda223 Catch errors if the DB is not up 2021-03-12 15:35:55 +11:00
Oliver Walters
006dd10a79 Delete successful tasks more than a month old 2021-03-12 15:35:33 +11:00
Oliver Walters
5b8eb1c530 Newline 2021-03-12 15:27:53 +11:00
Oliver Walters
bfb0cb3b47 Add a "heartbeat" task which runs every 5 minutes 
- Allows us to track if the worker is running
- Due to Stat.get_all() not always working
 2021-03-12 15:27:28 +11:00