inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 11:43:05 +00:00
Code Activity
11,644 Commits 8 Branches 165 Tags
e9b501f7ebcd4ac7aff3cb2d11bbcb6ca60835c3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 3f8ba0cd8e Merge pull request #2644 from eeintech/multi_step_order 
Set default error message visibility in modal options
 2022-02-19 07:35:13 +11:00
OliverandGitHub 0f7b6e77ea Merge pull request #2641 from SchrodingersGat/report-cache-fixes 
Report cache fixes
 2022-02-18 08:54:09 +11:00
OliverandGitHub 85ab8b5098 Merge pull request #2634 from SchrodingersGat/match-fields 
Match fields
 2022-02-18 08:33:48 +11:00
Oliver 7c64cb950c Delete template files from cache as they are uploaded 2022-02-18 00:01:49 +11:00
Oliver 6aec40b9ba Improved error messages when report templates (or snippets) are missing! 2022-02-17 23:46:43 +11:00
Oliver efc749c695 When uploading a report template, keep the existing filename (if it is the same report!) 2022-02-17 23:30:55 +11:00
Oliver 580effab92 Merge remote-tracking branch 'inventree/master' into match-fields 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2022-02-17 22:55:16 +11:00
Oliver 6e6f9d6c2f Reintroduce option to clear (delete) BOM before uploading new data 2022-02-17 22:54:02 +11:00
Oliver 1b6dacd5ba Allow processing of "null" cells (caused by xls / xlsx import) 2022-02-17 22:48:15 +11:00
OliverandGitHub 5421e0bd64 Merge pull request #2640 from SchrodingersGat/install-into-fixes 
Install into fixes
 2022-02-17 17:40:33 +11:00
Oliver 3226a1906f Critical bug fix: Check if serial numbers already exist when creating new StockItem 2022-02-17 17:17:09 +11:00
Oliver f485bc7d53 PEP fixes 2022-02-17 17:04:51 +11:00
Oliver 0604e1a127 Adds API endpoint for installing stock items into other stock items 
- Requires more filtering for the Part API
- Adds more BOM related functionality for Part model
- Removes old server-side form
 2022-02-17 17:03:17 +11:00
OliverandGitHub 023037e766 Merge pull request #2639 from SchrodingersGat/test-fixes 
Test fixes
 2022-02-17 14:59:28 +11:00
Oliver 31fd69fc76 Ensure unit tests are more resilient 2022-02-17 14:00:16 +11:00
Oliver 6199223636 Adds "refresh" button for stock test table 2022-02-17 13:46:11 +11:00
Oliver 578c161d4f Adds information on test result being deleted 2022-02-17 13:36:00 +11:00
Oliver 82cfc5423a Further improvements to unit tests 2022-02-17 13:07:16 +11:00
Oliver 47f6b709c9 Improve unit testing 2022-02-17 12:10:48 +11:00
Oliver e298a3adbf Implement unit test for missing columns 2022-02-17 11:45:44 +11:00
OliverandGitHub 08da2d6fd4 Merge pull request #2638 from SchrodingersGat/typo-fix 
Spelling fix
 2022-02-17 08:44:52 +11:00
Oliver bc6839d56e Spelling fix 2022-02-17 08:18:15 +11:00
OliverandGitHub f068ee6c2e Update FUNDING.yml 
Add ko_fi username
 2022-02-17 08:15:24 +11:00
OliverandGitHub e7aff93667 Create FUNDING.yml 
Add sponsor file
 2022-02-16 23:56:20 +11:00
OliverandGitHub 8bc84e8aab Merge pull request #2637 from SchrodingersGat/stock-item-breadcrumb-fix 
Fix breadcrumb tree for stock item page
 2022-02-16 22:49:31 +11:00
Oliver f6f512c40b Fix breadcrumb tree for stock item page 2022-02-16 22:22:04 +11:00
Oliver 371af2a34a unit test fixes 2022-02-16 22:19:02 +11:00
Oliver 9c8f15fd56 Fix field name 2022-02-16 19:43:14 +11:00
OliverandGitHub 19b7e6bb97 Merge pull request #2635 from SchrodingersGat/test-result-quick 
Adds a button to quickly "pass" a test
 2022-02-16 19:22:52 +11:00
Oliver fbef0e1ede js linting 2022-02-16 17:18:17 +11:00
Oliver 0f0325daba Adds a button to quickly "pass" a test 2022-02-16 17:16:17 +11:00
Oliver 8f6312f7f4 Adds generic javascript function for mapping file columns to model fields 2022-02-16 17:04:33 +11:00
Oliver f399f4fa34 Refactoring API endpoints 
- Improved URL naming scheme
 2022-02-16 16:57:27 +11:00
Oliver d7adb6959d Adds functionality to map file columns to model fiels 2022-02-16 14:57:13 +11:00
Oliver 58aa2adde7 Adds model mixin for generically determining which fields can be imported on any particular model 2022-02-16 11:42:15 +11:00
Oliver 24f1491b8e Adds generic API endpoint for extracting data from a tabulated file 2022-02-16 11:32:40 +11:00
OliverandGitHub 6c32f5c60d Merge pull request #2632 from SchrodingersGat/build-serial-number-guess 
Build output allocation tweak
 2022-02-16 08:37:47 +11:00
OliverandGitHub 49fe528f4e Merge pull request #2630 from matmair/coverage-fixes 
Coverage fixes
 2022-02-16 07:55:12 +11:00
Oliver bf39a614a1 Automatically select Bom Items with matching serial numbers when allocating stock to a build order output 2022-02-16 07:49:18 +11:00
OliverandGitHub bec6d2952d Merge pull request #2631 from SchrodingersGat/build-serial-number-magic 
Build serial number magic
 2022-02-15 13:58:56 +11:00
Oliver 35c9b6838e Form improvements 2022-02-15 13:33:32 +11:00
Oliver 2b344f1f25 PEP style fixes 2022-02-15 13:30:14 +11:00
Oliver 09853fd3df remove code which is now unused 2022-02-15 13:27:30 +11:00
Oliver 07af0902a3 Optionally auto-allocate stock items when creating a new build output 2022-02-15 13:27:14 +11:00
Oliver 24c13b04b6 Extract serial numbers from submitted form data 2022-02-15 13:19:41 +11:00
Oliver 037232c177 Adds query function to Part model to return trackable parts in the BOM 2022-02-15 13:19:14 +11:00
Oliver f90a27d01d Adds a new API endpoint for creating build outputs 2022-02-15 12:51:48 +11:00
OliverandGitHub dc4c1f138b Merge pull request #2629 from SchrodingersGat/index-unit-tests 
Adds unit tests for index page
 2022-02-15 11:45:08 +11:00
Oliver c048f3fb4a Adds unit tests for index page 
Some fairly simple unit tests to ensure that the index page is being correctly loaded.
 2022-02-15 10:50:30 +11:00
OliverandGitHub 6dfe22790e Merge pull request #2626 from SchrodingersGat/quantity-fix 
Fix for BOM import
 2022-02-15 09:37:06 +11:00
Oliver adfa289e9b Enforce proper formatting for 'quantity' field when importing BOM data 2022-02-15 09:11:14 +11:00
OliverandGitHub 1cc8fd28c0 Merge pull request #2623 from SchrodingersGat/bom-re-upload 
Allow BOM file to be "re-uploaded"
 2022-02-13 21:58:44 +11:00
Oliver e3fc1ab138 Allow BOM file to be "re-uploaded" 2022-02-13 20:49:42 +11:00
OliverandGitHub 0aeaf61254 Merge pull request #2564 from matmair/template-reduce-duplication 
Template reduce duplication
 2022-02-13 20:37:02 +11:00
OliverandGitHub b6cf5ee09e Merge pull request #2621 from matmair/fix-html-tags 
Fix html tags
 2022-02-13 20:34:19 +11:00
OliverandGitHub 8b34ea3066 Merge pull request #2609 from eeintech/child_model_permissions 
Child model permissions
 2022-02-10 18:08:38 +11:00
OliverandGitHub 7b4b07bac3 Merge pull request #2616 from SchrodingersGat/django-version 
Update base django version
 2022-02-10 13:47:28 +11:00
Oliver 9ad0b66ebc Update base django version 2022-02-10 13:13:51 +11:00
OliverandGitHub 6c083622e5 Merge pull request #2615 from SchrodingersGat/delete-multiple-outputs 
Delete multiple outputs
 2022-02-10 07:47:00 +11:00
Oliver 6b52a07e71 js linting 2022-02-10 00:53:38 +11:00
Oliver 71f9399760 Cleanup 2022-02-10 00:50:21 +11:00
Oliver 0d7b94fbfa Remove old form code which is no longer used 2022-02-10 00:48:06 +11:00
Oliver 96af074365 Adds API endpoint to delete build outputs 2022-02-10 00:46:38 +11:00
OliverandGitHub ed9b54d021 Merge pull request #2613 from SchrodingersGat/bom-import-unit-tests 
Bom import unit tests
 2022-02-10 00:40:47 +11:00
Oliver f460b14014 Add more unit testing for BOM file upload 
- Test "levels" functionality
- Test part guessing / introspection
 2022-02-10 00:13:37 +11:00
Oliver ffb319e136 Disable "submit" button to prevent multiple simultaneous uploads 2022-02-10 00:00:23 +11:00
Oliver d38a8adf4c Add button to display original row data 2022-02-09 23:49:26 +11:00
Oliver 383835aa89 Display initial errors when importing data 2022-02-09 23:26:32 +11:00
Oliver aa962aac83 Improve part "guess" algorithm 2022-02-09 23:26:13 +11:00
Oliver c0e940a898 Catch potential error when posting invalid numbers via REST API 2022-02-09 23:26:00 +11:00
Oliver 001437e083 Increased error checking when uploading BOM data 2022-02-09 23:02:09 +11:00
Oliver 2af617e92b Adds check for duplicate parts when importing 2022-02-09 11:34:25 +11:00
Oliver 67a9c0aeec PEP fixes 2022-02-09 11:31:36 +11:00
Oliver a9e1357ffb Return per-row error messages when extracting data 2022-02-09 11:30:58 +11:00
Oliver 29c3064ae7 Raise error if imported dataset contains no data rows 2022-02-09 11:27:51 +11:00
Oliver 692039f712 Add unit testing for uploading invalid BOM files 2022-02-09 08:38:28 +11:00
Oliver 8fc2695873 Catch potential file processing errors 2022-02-09 08:31:08 +11:00
OliverandGitHub 18ac1ceebe Update README.md 
Reorder sections
 2022-02-09 07:56:31 +11:00
Oliver 5376c5b022 Allow POST of files for unit testing 2022-02-08 23:54:48 +11:00
OliverandGitHub 1f473e42d0 Update README.md 
Add "follow on twitter" button
 2022-02-08 12:07:44 +11:00
OliverandGitHub 23e6caf1d9 Merge pull request #2610 from SchrodingersGat/po-button-fix 
Fix logic for enabling "place order" button
 2022-02-08 09:27:10 +11:00
Oliver dbf1e1b463 Fix logic for enabling "place order" button 2022-02-08 08:59:42 +11:00
OliverandGitHub ba1c7caa2a Merge pull request #2605 from SchrodingersGat/po-refresh 
Do not hide the "submit order" button
 2022-02-07 15:02:52 +11:00
OliverandGitHub c94c0902b6 Merge pull request #2603 from SchrodingersGat/bom-upload-improvements 
Bom upload improvements
 2022-02-07 14:46:25 +11:00
Oliver 55ff026696 Remove incorrect validation routine 2022-02-07 14:24:40 +11:00
Oliver 64b1523013 Do not hide the "submit order" button 2022-02-07 13:55:25 +11:00
OliverandGitHub c906cc5cfa Merge pull request #2604 from SchrodingersGat/currency-timeout 
Handle errors when connecting to currency exchange
 2022-02-07 13:54:25 +11:00
Oliver 11f541303b unit test fixes 2022-02-07 13:32:35 +11:00
Oliver 11c187f81d PEP fixes 2022-02-07 13:14:51 +11:00
Oliver a5a2fcd84a Only update rates on server launch if there are no rates available 2022-02-07 13:13:45 +11:00
Oliver 7265360648 JS linting 2022-02-07 13:07:03 +11:00
Oliver 4f638be874 Handle errors when connecting to currency exchange 
- Also adds timeout when connecting
 2022-02-07 13:04:42 +11:00
Oliver c6dc196053 PEP fixes 2022-02-07 12:32:50 +11:00
Oliver 509d58979e Remove old templates 2022-02-07 12:29:15 +11:00
Oliver 11d5900b69 Update upload file template 2022-02-07 12:25:09 +11:00
Oliver 131663cecc Adds options to clear existing BOM data when uploading 2022-02-07 12:20:18 +11:00
Oliver 4f26df3124 bug fix 2022-02-07 11:35:51 +11:00
Oliver 2ade14c47b Check for duplicate BOM items as part of serializer validation 2022-02-07 11:35:07 +11:00
Oliver a2c48d308f Adds a BomUpload endpoint to handle upload of complete BOM 2022-02-07 10:54:37 +11:00
Oliver 80818c464a Allow decimal values for BOM overage 2022-02-07 09:24:23 +11:00