inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
7,814 Commits 9 Branches 164 Tags
06f323fe479f3139c8bdc3487caf146e0a254b9d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 06f323fe47 Use GITHUB_BASE_REF 2021-09-12 21:52:02 +10:00
Oliver Walters 6baaf98d7e fix environment variable 2021-09-12 21:49:13 +10:00
Oliver Walters 5770789ddb more fix 2021-09-12 21:40:56 +10:00
Oliver Walters fd192b65bf workflow fix 2021-09-12 21:37:30 +10:00
Oliver Walters 5ee004eabd Add workflow to check version number 2021-09-12 21:36:14 +10:00
Oliver Walters 429add9000 Updates for docker workflows: 
- check_version_number script now handles stable and development codes
 2021-09-12 21:17:56 +10:00
OliverandGitHub 71ca60d679 Merge pull request #2044 from SchrodingersGat/new-line-item 
Bug fix - "Add line item" button
 2021-09-08 14:32:51 +10:00
Oliver b9b23a3853 bug fix 2021-09-08 14:14:14 +10:00
OliverandGitHub 829dd0d637 Merge pull request #2043 from SchrodingersGat/received-stock-items 
Fixes for purchase order stock table
 2021-09-08 13:29:05 +10:00
Oliver 387680fbcd More linting 2021-09-08 13:13:40 +10:00
Oliver 20788bb559 Bump pillow version for security fix 2021-09-08 13:02:49 +10:00
Oliver a32a30de52 javascript linting 2021-09-08 13:02:03 +10:00
Oliver 1a21576f28 Adds separate option for "prevent_new_stock" to stock_table 2021-09-08 12:57:42 +10:00
OliverandGitHub ba787a0485 Merge pull request #2041 from SchrodingersGat/metadata-fixes 
Fix OPTIONS request lookup time
 2021-09-08 12:52:00 +10:00
Oliver 8368798280 Move po-line-item-table into javascript file 
- for better linting
 2021-09-08 12:51:49 +10:00
Oliver 6012855ec4 PEP fixes 2021-09-08 12:24:33 +10:00
Oliver 919b39515f Improve instance lookup for metadata layer 
- Existing call to get_object() could take > 20 seconds in some cases
- Not really sure why, some issue with the DRF library
- Was probably parsing the entire queryset rather than doing a PK lookup
- Instead, directly use the provided pk to get the model
 2021-09-08 12:18:07 +10:00
OliverandGitHub 22aa0a03c9 Merge pull request #2039 from SchrodingersGat/requirements 
Re-add gunicorn to requirements file
 2021-09-08 08:48:20 +10:00
Oliver 84528df6f8 Re-add gunicorn to requirements file 2021-09-08 08:01:05 +10:00
OliverandGitHub a70f4c86eb Merge pull request #2013 from SchrodingersGat/receive-via-api 
Receive via api
 2021-09-07 23:56:44 +10:00
Oliver Walters f349dc01ea JS lint 2021-09-07 23:41:13 +10:00
Oliver Walters f38bf6e20a Adds unit testing for barcode field 2021-09-07 23:34:14 +10:00
Oliver Walters bf05c9cfae Adds "barcode" field to POLineItem receive serializer 2021-09-07 23:06:36 +10:00
Oliver Walters ccb191e5b1 Bump API version 2021-09-07 23:06:17 +10:00
OliverandGitHub 50ae331afd Merge pull request #2034 from SchrodingersGat/build-complete-scheduling 
Build completion scheduling
 2021-09-07 22:51:52 +10:00
Oliver Walters 125554c53f Merge remote-tracking branch 'upstream/master' into receive-via-api 
# Conflicts:
#	InvenTree/templates/js/dynamic/inventree.js
#	InvenTree/templates/js/translated/forms.js
#	InvenTree/templates/js/translated/tables.js
 2021-09-07 22:34:00 +10:00
Oliver Walters ecc7bd2d5b Unit test fixes 2021-09-07 22:27:39 +10:00
Oliver 5ab4be7025 Unit test fixes 2021-09-07 17:36:53 +10:00
Oliver 918106c225 Adds a background task to remove StockItem objects which are scheduled for deletion 2021-09-07 16:45:58 +10:00
Oliver 7d3cd03d6c Add "scheduled_for_deletion" field to StockItem 
- If set to True, this StockItem will be deleted (soon) by the background worker
- As deletion takes significant time, this prevents delete operations from blocking the UI
 2021-09-07 16:28:57 +10:00
OliverandGitHub 4b1c2677c5 Update README.md 2021-09-06 09:42:51 +10:00
OliverandGitHub 8b6ebc092a Merge pull request #2033 from SchrodingersGat/clip.html-fix 
Run HTML linting as .github action
 2021-09-04 09:43:14 +10:00
Oliver f363c0f084 Fix workflow file 2021-09-04 09:22:52 +10:00
Oliver c7d6b985bd LINT ALL THE THINGS 2021-09-04 09:08:46 +10:00
Oliver 42637ddefa more linting 2021-09-04 08:59:02 +10:00
Oliver 9b001cd298 Another fix 2021-09-04 08:48:34 +10:00
Oliver f0e5d1984c Fix for about.html 2021-09-04 08:46:30 +10:00
Oliver 0a8365e3bc Fix for clip.html 2021-09-04 08:45:06 +10:00
Oliver 514db57c0c Run HTML linting as .github actino 2021-09-04 08:31:47 +10:00
OliverandGitHub c275bf8d98 Merge pull request #2026 from inventree/js-linting 
Js linting
 2021-09-03 23:35:14 +10:00
Oliver Walters e5872f4b67 improve js debug comment 2021-09-03 23:16:35 +10:00
Oliver 888fa51cd7 lots of linting fixes for JS files 2021-09-03 22:54:17 +10:00
OliverandGitHub 3db830e7cd Merge pull request #2031 from SchrodingersGat/polineitem-destination 
Fix on_delete for PurchaseOrderLineItem.destination
 2021-09-02 11:37:54 +10:00
Oliver 5d703af932 Add migration file 2021-09-02 11:11:25 +10:00
Oliver 43c4e936a7 Fix on_delete for PurchaseOrderLineItem.destination 
- Currently set to DO_NOTHING
- However when deleting a StockLocation which has a PurchaseOrderLineItem.destionation point to it, this will cause an IntegrityError
 2021-09-02 10:41:23 +10:00
OliverandGitHub c90f9b0447 Merge pull request #2030 from matmair/html-code-smells 
Html code smells
 2021-09-02 08:47:59 +10:00
OliverandGitHub edb1602c7c Merge pull request #2028 from matmair/fix-html-tag 
fix html templates
 2021-09-02 07:10:15 +10:00
Oliver Walters cb403a5b29 More work 2021-08-30 22:28:01 +10:00
Oliver Walters a1b7239b7e indent error 2021-08-30 21:30:10 +10:00
Oliver Walters 6dde353646 Fix indent rule 2021-08-30 21:25:43 +10:00
Oliver Walters 4ffcf48ab3 4 spaces for indent 2021-08-30 21:21:26 +10:00
Oliver Walters fc125ca20c Fix workflow file 2021-08-30 21:16:54 +10:00
Oliver Walters 9781d585b0 Install eslint-config-google 2021-08-30 21:08:46 +10:00
Oliver Walters 3d5144b9bc Simplify eslintrc file 2021-08-30 20:30:44 +10:00
Oliver Walters 4c39607e00 Brace style fixes 2021-08-30 20:30:26 +10:00
Oliver Walters e1adef5010 typo fix 2021-08-30 20:08:18 +10:00
Oliver Walters 6177fe0c5a build.js 2021-08-30 19:52:28 +10:00
Oliver Walters 2112c6a9ad barcode.js 2021-08-30 19:33:43 +10:00
Oliver Walters 7d4945d302 company.js 2021-08-30 16:01:45 +10:00
Oliver Walters 0835fe92a0 bom.js 2021-08-30 15:54:31 +10:00
Oliver Walters 51eb40f3bc forms.js 2021-08-30 15:47:58 +10:00
Oliver Walters bb3b6fdc4d label.js 2021-08-30 15:34:46 +10:00
Oliver Walters e0e7788af6 More js fixes 2021-08-30 15:32:01 +10:00
Oliver Walters 50b54f0966 order.js 2021-08-30 14:57:17 +10:00
Oliver Walters 00f012311d inventree.js 2021-08-30 14:49:40 +10:00
Oliver Walters 90a75ac7cb nav.js 2021-08-30 14:44:44 +10:00
Oliver Walters 7d5b859233 part.js 2021-08-30 14:39:58 +10:00
Oliver Walters 3e03b1c31d report.js 2021-08-30 14:12:35 +10:00
Oliver Walters c846aeb60f stock.js 2021-08-30 14:07:34 +10:00
Oliver Walters 65874447ed bug fix 2021-08-30 13:13:12 +10:00
Oliver Walters 5d45fce240 remove import / export calls 2021-08-30 13:10:58 +10:00
Oliver Walters 24ca1c5641 Add "helpers.js" for common functions 2021-08-30 13:06:02 +10:00
Oliver Walters 140a2092c8 fixes for table_filters.js 2021-08-28 22:18:20 +10:00
Oliver Walters 0620e656a0 Fix linting errors or tables.js 2021-08-28 22:12:41 +10:00
Oliver Walters e85ddf3579 Add required env vars 2021-08-28 21:10:31 +10:00
Oliver Walters f7c515b889 add "invoke static" step 2021-08-28 21:05:55 +10:00
Oliver Walters 09a7a7d2e4 Install required files 2021-08-28 21:03:09 +10:00
Oliver Walters d0ccf8647d Add js linting to github workflow 2021-08-28 20:59:41 +10:00
Oliver Walters f57a31c9b5 Add a test framework script to pull down rendered javascript files 
- Use the testing framework so we don't need to spin up a server
 2021-08-28 20:46:51 +10:00
Oliver Walters 880a701881 eslint configuration file 2021-08-28 16:55:59 +10:00
Oliver Walters 62d877ba54 Adds script to pull down "rendered" versions of javascript files 2021-08-28 16:40:06 +10:00
OliverandGitHub e261fa6b29 Merge pull request #2024 from SchrodingersGat/category-param-fix 
Simple fix for category parameter settings
 2021-08-26 23:11:29 +10:00
Oliver Walters 3adf30a00c Simple fix for category parameter settings 2021-08-26 22:50:50 +10:00
OliverandGitHub e5de69cd96 Update version.py 
Actually bump the API version
 2021-08-26 22:13:13 +10:00
OliverandGitHub 320ca451cc Merge pull request #2023 from inventree/units-in-api 
Add "units" to PartBriefSerializer
 2021-08-26 22:12:27 +10:00
OliverandGitHub 610c05384b Merge pull request #2020 from SchrodingersGat/mpn-sorting-fix 
Mpn sorting fix
 2021-08-26 22:06:06 +10:00
Oliver Walters ec88415f3d Add "units" to PartBriefSerializer 2021-08-26 21:54:25 +10:00
Oliver ac8a0be74a Enable sorting by total_price 2021-08-26 08:48:19 +10:00
Oliver bad246bca6 Fixes for ordering of stock table 2021-08-26 08:24:31 +10:00
Oliver 212a7eeed1 Disable filtering for total_price (as this is not a database field!) 2021-08-26 07:59:47 +10:00
Oliver 8660f13ef5 Allow sorting by purchase price (unit price) 2021-08-26 07:50:19 +10:00
OliverandGitHub 9b6b5825f3 Merge pull request #2021 from SchrodingersGat/table-col-fix 
Change name of purchaseorder line item table
 2021-08-26 07:02:04 +10:00
Oliver 51992a92c1 Change name of purchaseorder line item table 
- Was conflicting with purchaseorder table
- Saved column selections were being overridden
 2021-08-25 18:00:32 +10:00
Oliver 4b8ef2ad62 Implements custom filtering back end 2021-08-25 17:46:42 +10:00
OliverandGitHub 75152fab0e Merge pull request #2018 from SchrodingersGat/file-upload-fix 
Fix for file upload bug
 2021-08-25 15:05:32 +10:00
Oliver 9c9407b1ab Add unit test for catching bug 
- Turns out that in an image was uploaded with more than ~2000 vertical pixels it would crash
- Smaller images worked fine?
 2021-08-25 14:48:45 +10:00
Oliver dcc8acb49a Data must be copied in a particular way 2021-08-25 14:12:26 +10:00
Oliver 44ab487b62 Fix for file upload bug 2021-08-25 12:05:41 +10:00
Oliver c9756d30bd Add a custom OrderingFilter class 
Needs further work
 2021-08-25 12:04:15 +10:00
Oliver 2923589c4a Fix sortName for purchase order line item table 2021-08-25 12:02:25 +10:00