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,800 Commits 9 Branches 164 Tags
6e8bf01a97d2cabfa5b59484c08f827aacb3a95c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OliverandGitHub 28878b4b0d Update feature_request.md 
Slight tweaks
 2021-08-24 22:30:01 +10:00
OliverandGitHub 18297cd2fb Update bug_report.md 
Slight tweaks to bug report template
 2021-08-24 22:28:42 +10:00
OliverandGitHub bdcc66bac7 Merge pull request #2009 from matmair/templates 
RFC: Issue Templates
 2021-08-24 22:26:55 +10:00
OliverandGitHub 0073a77e16 Merge pull request #2008 from matmair/fix-for-1986 
Fix for 1986
 2021-08-24 14:13:50 +10:00
OliverandGitHub 7f75c610ef Merge pull request #2012 from SchrodingersGat/search-preview-click 
Wrap search preview results in <a>
 2021-08-24 13:47:55 +10:00
Oliver 36a0496dd7 Wrap search preview results in <a> 
- Allows clicking with middle mouse (for e.g.) to open in new tab
 2021-08-24 13:11:37 +10:00
OliverandGitHub 44ecd958a2 Merge pull request #2011 from SchrodingersGat/boolean-form-fixes 
Fix for "part" form fields
 2021-08-24 12:10:00 +10:00
OliverandGitHub 56f27aae23 Merge pull request #2010 from SchrodingersGat/sales-order-tab-fix 
Hide "Sales Orders" tab if part is not salable
 2021-08-24 12:03:09 +10:00
Oliver 8fc79f45a3 Fix for "part" form fields 
- Specify "default" rather than overriding "value"
 2021-08-24 11:55:58 +10:00
Oliver 7646535aaf Hide "Sales Orders" tab if part is not salable 2021-08-24 11:48:42 +10:00
OliverandGitHub 5349addc06 Merge pull request #2005 from eeintech/ui_updates 
Updated color of `new` and `add` UI buttons
 2021-08-24 08:12:45 +10:00
OliverandGitHub f136c974cf Merge pull request #2003 from SchrodingersGat/edit-purchase-prices 
Edit purchase prices
 2021-08-23 22:54:12 +10:00
Oliver 90d0b8b15d Bump API version 2021-08-23 21:45:40 +10:00
Oliver 5d4f35958d Point table at the new read-only field 2021-08-23 21:45:32 +10:00
Oliver bb8b85c375 Separate purchase_price and purchase_price_currency for StockItem serializer 
- Add "purchase_price_string" for a read-only stringified representation
- Unit testing
 2021-08-23 21:44:12 +10:00
Oliver d267d04bed Allow validation of empty money values 2021-08-23 21:43:31 +10:00
Oliver f96051d863 Replace print statement with a logger warning 2021-08-23 21:39:54 +10:00
Oliver 8662e6a109 Fix a super annoying validation issue 
- Was throwing opaque "too many values to unpack" error
- Simply needed the name of the field.
 2021-08-23 21:39:00 +10:00
OliverandGitHub 1fb76b9987 Merge pull request #1999 from matmair/turn-of-functions 
Disable functions in navbars
 2021-08-23 20:29:28 +10:00
OliverandGitHub fd1dd792c6 Merge pull request #1957 from matmair/bpm-purchase-price 
BOM - show purchase price
 2021-08-23 11:07:30 +10:00
OliverandGitHub 87a41c7e39 Merge pull request #2000 from SchrodingersGat/dev-conf-fix 
Fix for docker development env file
 2021-08-23 09:10:25 +10:00
Oliver 47524f6ea3 Fix for docker development env file 2021-08-23 08:39:09 +10:00
OliverandGitHub a5f26c7f09 Merge pull request #1998 from bobek/patch-1 
Fix for production docker environment
 2021-08-23 08:38:04 +10:00
OliverandGitHub b6df623554 Merge pull request #1997 from SchrodingersGat/new-po-from-order 
Refactor buttons in "order parts" wizard
 2021-08-23 00:49:27 +10:00
Oliver Walters 174b7ba7f2 Fix for "new purchase order" button 2021-08-23 00:28:36 +10:00
Oliver Walters 449e0c0af2 Refactor button in first step of "order parts" wizard 
- "new supplier part" button was broken
- Was linked to the old "launchModalForm" code
- Now calls createSupplierPart
 2021-08-23 00:17:45 +10:00
OliverandGitHub 3cf06b4960 Merge pull request #1995 from SchrodingersGat/delete-unused-images 
remove some unused images
 2021-08-23 00:11:39 +10:00
Oliver Walters f2e58ebbdd remove some unused images 2021-08-22 23:54:43 +10:00
OliverandGitHub 370fbea396 Merge pull request #1987 from matmair/fix-for-1986 
Disable table sorting when order is fixed
 2021-08-22 23:47:21 +10:00
OliverandGitHub 51de0a982a Merge pull request #1990 from matmair/fix-tooltip-linebreak 
Fix tooltip linebreak
 2021-08-22 08:19:54 +10:00
OliverandGitHub 8646c73021 Merge pull request #1980 from matmair/housekeeping 
Housekeeping
 2021-08-20 09:02:33 +10:00