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,357 Commits 6 Branches 99 Tags 484 MiB
79374c5dfd
Commit Graph

4202 Commits

Author SHA1 Message Date
Matthias
2cfb9c60a3 space cleanup 2021-05-05 20:57:00 +02:00
Matthias
b392586a08 quantity also for modal 2021-05-05 20:55:37 +02:00
Matthias
dc4fb64987 add in price modal in table 2021-05-05 20:53:53 +02:00
Matthias
ee028ef925 space cleanup 2021-05-05 20:38:27 +02:00
eeintech
2cd1df691b Working towards part matching 2021-05-05 13:16:40 -04:00
eeintech
9773fee50b Validation of matching fields is working 2021-05-05 12:40:48 -04:00
Oliver Walters
7a19145be1 Disable wrapping for translation files 
This ensures that the updates pushed back from crowding don't have unnecessary file deltas

Ref: https://docs.djangoproject.com/en/3.2/ref/django-admin/#django-admin-makemessages
 2021-05-05 17:34:35 +10:00
eeintech
b4342d6203 Fixed templates, not sure why can't keep FileManager across forms... and also need to save form data 2021-05-04 17:35:27 -04:00
Matthias
7fa235282b sale price in ui 2021-05-04 22:50:04 +02:00
Matthias
294e86cc38 Add in sale price model 2021-05-04 21:56:25 +02:00
Matthias
55cdeef30e adds price-calc to purchase order Fixes #1513 2021-05-04 21:33:00 +02:00
eeintech
64fb492b97 Added match parts step, need to process fields data 2021-05-04 14:45:52 -04:00
eeintech
7cdf0af04a Added upload file step 2021-05-04 12:20:57 -04:00
eeintech
373898d43e Added step description and crispy form tag 2021-05-04 10:28:00 -04:00
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
Oliver
5d214fc869
Merge pull request #1535 from eeintech/get_price 
Added support for fractional price and lower price break
 2021-05-01 09:52:21 +10:00
Oliver
94ff8829f7
Merge pull request #1536 from eeintech/manufacturer_part_api_fix 
API fixes related to ManufacturerPart
 2021-05-01 08:26:32 +10:00
Matthias
036c5661ec Link for credits in UI and README Closes #1533 2021-04-30 23:40:52 +02:00
eeintech
4972440dda Fixed API test 2021-04-30 15:27:36 -04:00
eeintech
41962ca23a API fixes related to ManufacturerPart 2021-04-30 13:54:56 -04:00
Oliver
c60f4c4f2f
Merge pull request #1529 from matmair/matmair/issue1527 
per session user-language settings
 2021-04-30 11:53:39 +10:00
eeintech
ad8d95f2f0 Added two more tests with fractional quantities 2021-04-29 14:35:23 -04:00
eeintech
87b38ec992 Added support for fractional part/bom quantity and price 2021-04-29 14:22:07 -04:00
Oliver
2eafdd53b8
Merge pull request #1530 from eeintech/complete_build_output_fix 
Fixes to create build output form
 2021-04-29 14:56:29 +10:00
eeintech
d072187bf8 Fixed exception for quantity check 2021-04-28 16:46:42 -04:00
eeintech
a63d5012f0 Purchase order fixes 2021-04-28 13:16:40 -04:00
eeintech
b1ff686395 Fixes to create build output form, added validation on quantity field 2021-04-28 11:18:47 -04:00
Matthias
15eb835ffc explicit redirection url Fixes #1527 2021-04-28 14:38:07 +02:00
Matthias
c5640fe6c6 renamed theme to appearance 2021-04-28 14:37:11 +02:00
Matthias
660f2673ac added in language-change form 2021-04-28 14:26:55 +02:00
Matthias
292944179e fixed wrong i18n-code for polish 2021-04-28 13:57:39 +02:00
Oliver
e6c2252887
Merge pull request #1523 from eeintech/required_parts_build_order 
Updated "Required for Build Orders" API queryset
 2021-04-28 08:57:30 +10:00
Oliver
2e5be35517
Merge pull request #1525 from matmair/matmair/issue1524 
[BUG] no attribute MPN
 2021-04-28 07:52:17 +10:00
Matthias
fc429708f1 [BUG] no attribute MPN 
Fixes #1524
 2021-04-27 21:38:06 +02:00
eeintech
f0b44450fb Updated 'Required for Build Orders' API queryset 2021-04-27 12:48:36 -04:00
Oliver
4d2e23f701
Merge pull request #1521 from matmair/matmair/issue1519 
More syntax for adding serial numbers #1519
 2021-04-27 20:43:46 +10:00
Matthias
2de3b892a5 More syntax for adding serial numbers #1519 2021-04-26 21:33:39 +02:00
Oliver Walters
80f11290c9 Remove old command 2021-04-25 12:30:59 +10:00
Oliver Walters
f8ec32c3f5 Remove unused include 2021-04-25 12:24:05 +10:00
Oliver Walters
b08cd8da20 Remove dbbackup integration 
- Data dumping and restoring is now very complex!
- We should use the invoke export-records function now, rather than relying on dbbackup / dbrestore
- Documentation will be updated to match
 2021-04-25 12:14:36 +10:00
Oliver Walters
b6cfa50e12 Allow data operations to run for 'test' 2021-04-25 11:59:35 +10:00
Oliver Walters
f766711838 Add fixture for users / groups 2021-04-25 11:41:48 +10:00
Oliver Walters
e13850515d PEP fixes 2021-04-25 11:30:17 +10:00
Oliver Walters
8ad16ceb9c Refactorin' 2021-04-25 11:07:57 +10:00
Oliver Walters
06afd4d726 Refactor "ready" state into a function 2021-04-25 10:52:31 +10:00
Oliver Walters
6e5fc43105 Prevent copying of labels and templates during data import phase 2021-04-25 10:33:11 +10:00
Oliver Walters
2d7bff0773 Prevent auto-update of group permissions during loaddata stage 2021-04-25 10:30:56 +10:00
Oliver Walters
d6ef9ee212 Adds some more translatable strings 
- Mostly just to check the workflow integration
 2021-04-22 23:19:11 +10:00
Oliver
2f4e78fe51
Merge pull request #1508 from matmair/use-spaces 
use spaces instead of tabs
 2021-04-22 21:16:45 +10:00
Matthias
294dd0525f use spaces instead of tabs 2021-04-22 12:53:49 +02:00
Oliver Walters
4a522bb05a Allow 'admin' account access to the report models 2021-04-22 14:53:42 +10:00
Oliver
c5b6e22a58
Merge pull request #1505 from eeintech/email_reset 
Enabled default email sender setting
 2021-04-22 08:50:05 +10:00
Oliver
34341c31f2
Merge pull request #1504 from SchrodingersGat/turkish 
Added skeleton for Turkish translation
 2021-04-22 08:46:31 +10:00
eeintech
ee3f3c7960 Updated default backend setting and enabled default sender setting 2021-04-21 09:28:30 -04:00
Oliver Walters
d9cf721589 Added skeleton for Turkish translation 2021-04-21 22:36:57 +10:00
Matthias Mair
37953f9926
Merge branch 'master' into l10n_trans 2021-04-21 14:17:19 +02:00
Matthias Mair
41e5a503ac New translations django.po (German) 
[ci skip]
 2021-04-21 12:42:23 +02:00
Matthias Mair
78bf6237d0 New translations django.po (Chinese Simplified) 
[ci skip]
 2021-04-21 11:33:38 +02:00
Matthias Mair
6600879ed1 New translations django.po (Russian) 
[ci skip]
 2021-04-21 11:33:37 +02:00
Matthias Mair
0131340bdf New translations django.po (Polish) 
[ci skip]
 2021-04-21 11:33:35 +02:00
Matthias Mair
08887d2e78 New translations django.po (Japanese) 
[ci skip]
 2021-04-21 11:33:34 +02:00
Matthias Mair
c5e5dea904 New translations django.po (Italian) 
[ci skip]
 2021-04-21 11:33:32 +02:00
Matthias Mair
2019dc1f78 New translations django.po (Spanish) 
[ci skip]
 2021-04-21 11:33:31 +02:00
Matthias Mair
eccd4762b3 New translations django.po (French) 
[ci skip]
 2021-04-21 11:33:29 +02:00
Matthias Mair
78cbfcfda7 New translations django.po (German) 
[ci skip]
 2021-04-21 11:33:28 +02:00
Matthias Mair
227327a687 New translations django.po (Chinese Simplified) 2021-04-21 11:17:46 +02:00
Matthias Mair
39af8d8a94 New translations django.po (Russian) 2021-04-21 11:17:45 +02:00
Matthias Mair
3a23c78202 New translations django.po (Polish) 2021-04-21 11:17:43 +02:00
Matthias Mair
97049a90f5 New translations django.po (Japanese) 2021-04-21 11:17:42 +02:00
Matthias Mair
c8a28c4bfb New translations django.po (Italian) 2021-04-21 11:17:40 +02:00
Matthias Mair
8fbbe4ab8e New translations django.po (Spanish) 2021-04-21 11:17:39 +02:00
Matthias Mair
51994b210d New translations django.po (French) 2021-04-21 11:17:37 +02:00
Oliver Walters
3e63334125 Change file just to re-run CI 2021-04-21 17:34:56 +10:00
Oliver Walters
c0ab2d1da9 Unit test fixes 2021-04-21 17:16:07 +10:00
Oliver Walters
59341397ba Fixes 2021-04-21 16:44:18 +10:00
Oliver Walters
9b763ca715 Adds ability to specify "status" of a build output at time of completion 2021-04-21 16:44:18 +10:00
Oliver Walters
0722aea58a Further fixes for unit tests 2021-04-21 16:44:18 +10:00
Oliver Walters
debc086f89 Unit test improvements 2021-04-21 16:44:17 +10:00
Oliver Walters
715d912137 Bug fixes 2021-04-21 16:44:17 +10:00
Oliver Walters
5a44a50f3b Fix date in build table 2021-04-21 16:44:17 +10:00
Oliver Walters
76e2b67f36 Fix logic for completing builds 
- Display better messages to the user, too
 2021-04-21 16:44:17 +10:00
Oliver Walters
4420557863 Refactor various functions for assessing build allocation 2021-04-21 16:44:17 +10:00
Oliver Walters
05e2b62305 Bug fix - calculate button PK at run time!! 2021-04-21 16:44:17 +10:00
Oliver Walters
16b01ed772 significant rework of the build allocation tables / views 2021-04-21 16:44:16 +10:00
Oliver Walters
f0595cc052 Fix for display of "outstanding" allocations 2021-04-21 16:44:16 +10:00
Oliver Walters
9e470d4064 Add separate section for "untracked" part allocation 2021-04-21 16:44:16 +10:00
Oliver Walters
a1e835e01b Add some new (empty) locale translation entries 
- fr
- it
- ja
- pl
- ru
- zh

Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)

The CI pipeline now runs the translation and static collection steps, to check those for errors.
 2021-04-21 12:33:56 +10:00
Oliver
4903826be1
Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
Matthias
99dc02e2cb cleaning up names / comments 2021-04-20 14:39:28 +02:00
Matthias
4d439db322 fixing styling issues 2021-04-20 13:48:05 +02:00
Matthias
2943dc6083 initial implementation as in #1485 2021-04-20 13:37:19 +02:00
Oliver Walters
4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters
2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters
fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters
38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters
412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters
6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters
f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
Oliver
21708dabaf
Merge pull request #1490 from SchrodingersGat/django-3.2 
Update to django 3.2
 2021-04-20 11:25:25 +10:00
Oliver Walters
0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters
6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
eeintech
2dbd61c611 Stock return to customer fix, stock children item table fix 2021-04-19 11:25:39 -04:00
Oliver Walters
252abb920f Do not print EMAIL warning if in TEST mode 2021-04-19 20:49:24 +10:00
Oliver
157d58b157
Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias Mair
26e12f299d New translations django.po (German) 2021-04-18 13:31:52 +02:00
Matthias Mair
00ddffa59e New translations django.po (German) 2021-04-18 13:04:25 +02:00
Matthias
e668577d97 fix as noted in #1481 2021-04-18 12:31:17 +02:00
Oliver
26c19dc77d
Merge pull request #1479 from matmair/feature/translations 
Feature/translations
 2021-04-18 20:23:51 +10:00
Oliver
724ecebb4c
Update version.py 2021-04-18 19:54:16 +10:00
Oliver
0b5557395b
Update version.py 2021-04-18 19:53:15 +10:00
Oliver Walters
1502a07b81 Remove log output which was leaking password into the logs 2021-04-18 16:54:35 +10:00
Matthias
0c4d22623d added german translations 2021-04-18 01:33:35 +02:00
Matthias
c99850abf3 po files for new chnaged translation strings 2021-04-18 01:27:04 +02:00
Matthias
c3319e88f4 typo fix 2021-04-18 01:21:44 +02:00
Matthias
5b9c4dc225 sipler translation strings 2021-04-18 01:21:11 +02:00
Matthias
c233e82919 added translatable strings 2021-04-17 23:54:23 +02:00
Matthias
46822017c6 FIX: multiline trans not possible 2021-04-17 23:52:55 +02:00
Matthias
59063bee6b extending translations to the whole sentence 2021-04-17 23:52:21 +02:00
Matthias
20af4c9ba0 template tag for translatable alerts with links 2021-04-17 23:48:47 +02:00
Matthias
7a0a901c2b translations fo true/false yes /no 2021-04-17 23:28:10 +02:00
Matthias Mair
410d6195a8 New translations django.po (German) 2021-04-17 19:00:32 +02:00
Matthias Mair
37b3ac07ff New translations django.po (German) 2021-04-17 17:46:27 +02:00
Matthias
b1e08dae78 Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title 2021-04-17 12:19:38 +02:00
Matthias Mair
d8d015925b New translations django.po (German) 2021-04-17 11:03:13 +02:00
Matthias Mair
d561186313 New translations django.po (German) 2021-04-17 10:01:03 +02:00
Oliver
2be78f5d4c
Merge pull request #1469 from eeintech/stock_item_template_fix 
Fixed stock item template for items without manufacturer part
 2021-04-17 08:05:21 +10:00
eeintech
2b4723cc32 Hide system alert for non-staff users, introduced orange icon for less severe alert than background workers not running (like missing email config) 2021-04-16 12:22:13 -04:00
eeintech
09ef85ce9d Fixed stock item template for items without manufacturer part 2021-04-16 11:43:21 -04:00
Oliver
d4529ec1c4
Merge pull request #1464 from matmair/translation_improv 
Translation improvments
 2021-04-16 21:46:07 +10:00
Nigel
6f00c662a1
fix: don't link manufacturer part if it doesn't have one 2021-04-15 16:28:50 -06:00
Matthias
098ac0c461 using feature in views 2021-04-15 14:52:08 +02:00
Matthias
d49977bed3 initial implementation as described in #1463 2021-04-15 14:51:11 +02:00
Matthias
cfae92e22b more translated strings for api-titles and filters 2021-04-15 12:15:02 +02:00
Matthias Mair
ecbab57b3b New translations django.po (German) 2021-04-15 12:14:14 +02:00
Matthias Mair
bc140be0ca New translations django.po (German) 2021-04-15 11:18:25 +02:00
Oliver
3e6429cb13
Merge pull request #1462 from eeintech/stock_label 
Added revision and stock item QR code URL for label creation
 2021-04-15 13:00:09 +10:00
Matthias Mair
ddf14a8f3b New translations django.po (German) 2021-04-14 22:58:16 +02:00
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