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
4,093 Commits 9 Branches 164 Tags
0f9c4703cf07828b01513bbf892f86750ddda5e6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 0f9c4703cf Update unit testing 2021-01-03 23:33:47 +11:00
Oliver Walters b05504e1c4 Add PART_VIRTUAL setting 2021-01-03 23:13:58 +11:00
Oliver Walters 0aeeba808c PEP fixes 2021-01-03 23:07:21 +11:00
Oliver Walters 6c7b648133 Implement global settings for assembly and template values of Part model 2021-01-03 23:06:51 +11:00
Oliver Walters 9fa37a9156 Improve visualisation of global settings 2021-01-03 22:57:39 +11:00
OliverandGitHub bdc3a9ef02 Merge pull request #1198 from SchrodingersGat/stock-item-form-fix 
Fix for StockItem create / edit forms
 2021-01-03 14:15:56 +11:00
Oliver Walters 2ad090c224 pop purchase_price field for StockItemEdit form 2021-01-03 13:15:42 +11:00
Oliver Walters fe0d356675 pops the purchase_price field instead of using a HiddenInput 
Using a HiddenInput on a MoneyFormField causes a validation error, for some reason...
 2021-01-03 13:13:14 +11:00
OliverandGitHub 11c6248b06 Merge pull request #1197 from SchrodingersGat/bom-fix 
Fix variable scope issue
 2021-01-03 10:30:47 +11:00
Oliver Walters 298e9cae65 Fix variable scope issue 2021-01-03 10:07:38 +11:00
OliverandGitHub 2dfa4d1acd Merge pull request #1196 from SchrodingersGat/target-date-optional 
Target date optional
 2021-01-03 09:00:46 +11:00
Oliver Walters 725a70327a Add some unit testing 2021-01-02 22:21:37 +11:00
Oliver Walters b2a732197b Fix target date form field for SalesOrder 2021-01-02 21:54:07 +11:00
Oliver Walters 2b57ffeb08 Custom date picker field 
- Prevents picker from being "required" by the form
 2021-01-02 21:50:10 +11:00
Oliver Walters 03276629c2 CSS tweaks 2021-01-02 21:41:47 +11:00
OliverandGitHub 7560b7e167 Merge pull request #1177 from SchrodingersGat/sales-order-overdue 
Sales order overdue
 2020-12-18 20:06:48 +11:00
Oliver Walters 08a8556fe7 Fix unit testing 2020-12-18 19:46:02 +11:00
Oliver Walters 13e924cc05 Fix default value for PO and SO codes 2020-12-18 16:10:55 +11:00
Oliver Walters 8e13a7b470 Add "overdue sales orders" to index page 2020-12-18 12:45:42 +11:00
Oliver Walters c34196538b Filter API by overdue status 2020-12-18 12:40:47 +11:00
Oliver Walters b21c6f0b99 Add overdue filter for salesorder table 2020-12-18 12:27:08 +11:00
Oliver Walters c6134b54ab Add "overdue" status to SalesOrder serializer 2020-12-18 12:26:58 +11:00
Oliver Walters 000348f70f Add 'target_date' field to SalesOrder model 2020-12-18 12:19:16 +11:00
OliverandGitHub 8bb4683bbe Merge pull request #1175 from eeintech/fix_stock_template 
Keep 'stock actions' button enabled when on children tab
 2020-12-18 12:02:39 +11:00
OliverandGitHub d38d9b21a9 Merge pull request #1174 from eeintech/fix_category_parameter_url 
Fixed category parameter templates settings view
 2020-12-18 12:00:51 +11:00
OliverandGitHub a8c6e79bc0 Merge pull request #1172 from SchrodingersGat/duplicate-ipn-fix 
Bugfix for duplicate IPN checks when blank IPN is used
 2020-12-16 21:53:14 +11:00
Oliver Walters 06d9f4f982 Bugfix for duplicate IPN checks when blank IPN is used 2020-12-16 21:02:53 +11:00
OliverandGitHub 7df25df2af Merge pull request #1168 from SchrodingersGat/order-date 
Build Order Target Date
 2020-12-16 19:36:10 +11:00
Oliver Walters 464d76a819 Update form title strings 2020-12-16 19:09:53 +11:00
Oliver Walters 447f0b0ed7 Update translations 2020-12-16 19:03:04 +11:00
Oliver Walters 0500036d0a settings.py - typo fix 2020-12-16 16:58:40 +11:00
Oliver Walters 261a9af4f5 Typo fix 2020-12-16 16:32:20 +11:00
OliverandGitHub 04336dd039 Merge pull request #1169 from SchrodingersGat/parent-test-link 
Render link rather than just text
 2020-12-16 16:29:54 +11:00
Oliver Walters a9310d4a39 Add a #TODO in code 2020-12-16 16:16:07 +11:00
Oliver Walters a8704a05d6 PEP style fixes 2020-12-16 16:15:39 +11:00
Oliver Walters 597bf8be73 Add date input to build target_date 2020-12-16 16:13:38 +11:00
Oliver Walters 6ef4325eac Javascript formatting 2020-12-16 15:55:42 +11:00
Oliver Walters 1a07ae0936 Render link rather than just text 2020-12-16 15:48:41 +11:00
OliverandGitHub bf3b5bdd7f Merge pull request #1167 from SchrodingersGat/login-page 
Improve rendering for login page
 2020-12-15 23:34:32 +11:00
Oliver Walters 17d23fa47c Add overdue builds to the index page 2020-12-15 23:34:28 +11:00
Oliver Walters c8c50af54b Filter builds by "overdue" status 2020-12-15 23:31:19 +11:00
Oliver Walters 51da26d21d Filter builds by "overdue" status 2020-12-15 23:27:59 +11:00
Oliver Walters 802dd5174c Add "target_date" for Build model 
- Add "overdue" status to Build serializer
 2020-12-15 23:24:37 +11:00
Oliver Walters f11348c965 Improve rendering for login page 2020-12-15 22:39:57 +11:00
OliverandGitHub a7d825158c Merge pull request #1164 from SchrodingersGat/stock-report-filter 
Stock report filter
 2020-12-15 13:32:13 +11:00
Oliver Walters 297bfd776c Pre-select a template if only one matching one exists 2020-12-15 12:31:02 +11:00
Oliver Walters ef032d406f Bugfix for stock report filter 2020-12-15 11:57:52 +11:00
OliverandGitHub 980cb9522b Merge pull request #1162 from SchrodingersGat/gunicorn-conf 
Update default gunicorn conf file
 2020-12-14 11:00:57 +11:00
Oliver Walters 55b7cd3d6a PEP fix 2020-12-14 10:44:38 +11:00
OliverandGitHub 70cac17138 Merge pull request #1163 from SchrodingersGat/hide-purchase-price 
Hide purchase price field for non-purchaseable parts
 2020-12-14 10:43:21 +11:00
Oliver Walters 648595cf18 Hide purchase price field for non-purchaseable parts 2020-12-14 09:55:39 +11:00
Oliver Walters d609e881c2 Update default gunicorn conf file 2020-12-14 09:43:07 +11:00
OliverandGitHub 1c168452a4 Merge pull request #1159 from eeintech/roles_overview 
Display permission levels for each ruleset in Group admin list view
 2020-12-11 10:03:56 +11:00
OliverandGitHub 9dae7c1566 Merge pull request #1154 from SchrodingersGat/build-delete-fix 
Change delete behaviour for parent build item
 2020-12-01 12:36:24 +11:00
Oliver Walters 47d38e1cca Change delete behaviour for parent build item 
- was causing database integrity errors when a parent build existed
 2020-12-01 10:24:51 +11:00
OliverandGitHub 28a5ee32c4 Merge pull request #1152 from elmo2k3/fix-stocklist-sidebar 
Fix sidenav in stocklist
 2020-12-01 08:56:41 +11:00
OliverandGitHub a8f605c2e6 Merge pull request #1149 from SchrodingersGat/bom-upload-speed 
Vastly improved speed of BOM upload
 2020-11-27 15:25:46 +11:00
Oliver Walters ea2f5009c8 Vastly improved speed of BOM upload 
- Was calculating the stock levels for *every* part, for *every* drop down
- Many many many calls were being made
- Just remove stock count entirely from the drop-down menus
 2020-11-27 14:40:30 +11:00
OliverandGitHub a5e6ac2300 Merge pull request #1148 from SchrodingersGat/order-parts 
Order parts
 2020-11-27 12:28:04 +11:00
OliverandGitHub b150c9c6bc Merge pull request #1147 from SchrodingersGat/form-fixes 
Fixes for 'non field' errors in forms
 2020-11-27 12:27:53 +11:00
Oliver Walters 50a88e4826 Revert "Add extra context to SupplierPartCreate form" 
This reverts commit 5f8f0232a9.
 2020-11-27 11:19:16 +11:00
Oliver Walters 6c68197e61 Allow part ordering from build view 2020-11-27 11:18:58 +11:00
Oliver Walters 7068f70811 Fixes for 'order parts' form 
- Sometimes the part pk was not being retrieved properly
 2020-11-27 11:18:45 +11:00
Oliver Walters 607cc90ce0 Add extra context to SupplierPartCreate form 
(cherry picked from commit 5f8f0232a9)
 2020-11-27 11:18:23 +11:00
Oliver Walters 5f8f0232a9 Add extra context to SupplierPartCreate form 2020-11-27 11:17:55 +11:00
Oliver Walters 56f05e2604 Fixes for 'non field' errors in forms 
- Fixes issue where non-model fields would not show error text
 2020-11-27 10:42:01 +11:00
OliverandGitHub aacc7119bd Merge pull request #1144 from SchrodingersGat/bom-fixes 
Bom fixes
 2020-11-24 22:28:20 +11:00
Oliver Walters 083d7671d0 Bug fix for BOM table 
If the BOM for part included a BomItem with the same PK as the top-level part,
the bootstrap-tree-grid library borked

Probably for good reason, too!

So we now ensure that the top-level key is unique
 2020-11-24 21:19:19 +11:00
Oliver Walters 28333c1a21 Add a simple "shell" task 2020-11-24 21:18:00 +11:00
Oliver Walters e3231bbedb Hide "pricing" information in the BOM table 2020-11-24 20:58:18 +11:00
OliverandGitHub 3ff0759bb9 Merge pull request #1142 from SchrodingersGat/bom-form-fixes 
Bom form fixes
 2020-11-24 14:23:04 +11:00
Oliver Walters b5d75d6e6a PEP fixes 2020-11-24 11:56:51 +11:00
Oliver Walters ce82579930 Cleanup getRequiredParts function 2020-11-24 10:18:07 +11:00
Oliver Walters 371ec582e1 Cleanup queryset for BomItemEdit view 2020-11-24 09:43:49 +11:00
Oliver Walters 3391db506a Cleanup queryset for BomItemCreate view 2020-11-24 09:43:32 +11:00
Oliver Walters af9b88de11 Fix for BomItem clean function 
Handle the case where the sub_part does not exist
 2020-11-24 09:33:26 +11:00
OliverandGitHub 73259c0bcb Merge pull request #1140 from SchrodingersGat/request-frequency 
Reduce duplicate function calls in custom context parser
 2020-11-20 11:40:10 +11:00
OliverandGitHub a0168515c3 Merge pull request #1139 from eeintech/fix_supplierpart_edit_form 
Fix for SupplierPart edit form validation
 2020-11-20 09:40:00 +11:00
Oliver Walters 20e8161038 Reduce duplicate function calls in custom context parser 2020-11-20 08:29:06 +11:00
OliverandGitHub 6b104fbb8b Merge pull request #1136 from SchrodingersGat/warning-icon 
Add framework for "health checks"
 2020-11-19 13:30:17 +11:00
Oliver Walters 4049c8e915 Adds framework for "server health" display 
- Adds global context object "system_healthy" (boolean)
- Framework for running system health checks
- Updated system info forms
- Displays warning next to user menu if system health errors exist

(cherry picked from commit ce6d626ab39147fc389de90815ca8baae2385d82)
 2020-11-19 12:36:54 +11:00
OliverandGitHub e55f4a2798 Merge pull request #1135 from SchrodingersGat/quoth-the-raven 
Fixes for custom SQL queries
 2020-11-19 10:34:53 +11:00
Oliver Walters 599220a931 Fixes for custom SQL queries 
- Don't use double quotes!
- NO NO NO!
- Single quotes only
 2020-11-19 09:15:16 +11:00
OliverandGitHub 0594ebaef7 Merge pull request #1133 from SchrodingersGat/stock-table-fix 
Smallt tweaks for the Stock table
 2020-11-18 15:24:06 +11:00
Oliver Walters 24fd520ec3 Smallt tweaks for the Stock table 2020-11-18 15:03:51 +11:00
OliverandGitHub 4daf291619 Merge pull request #1131 from SchrodingersGat/purchase-price-fix 
Fix for StockItem creation form
 2020-11-17 16:07:31 +11:00
Oliver Walters 6144d7e209 Fix for StockItem creation form 
- purchase_price field was required (should not be!)
- Fixed some validation issues
- Cleaned up form implementation
 2020-11-17 15:29:44 +11:00
OliverandGitHub 9fa718e58d Merge pull request #1130 from eeintech/api_category_parameters 
Improved API endpoint for category parameter templates
 2020-11-17 09:36:34 +11:00
OliverandGitHub d8e7c2a932 Update version.py 2020-11-15 16:53:27 +11:00
OliverandGitHub 20f6964b1f Update version.py 2020-11-15 16:51:50 +11:00
OliverandGitHub 771efecaa2 Merge pull request #1127 from SchrodingersGat/settings-view-unit-test 
Extra unit testing for settings forms / views
 2020-11-14 09:19:31 +11:00
Oliver Walters 2e842503e6 Fix try statement 2020-11-14 07:39:51 +11:00
Oliver Walters b738f8b143 Try transaction.atomic 2020-11-13 22:22:02 +11:00
Oliver Walters aae1400929 Mayyyyyyyyyyyyybe? 2020-11-13 21:37:39 +11:00
Oliver Walters 5f9758e85f More fixes 2020-11-13 21:01:30 +11:00
Oliver Walters 03e852f957 Remove custom save method 2020-11-13 20:22:28 +11:00
OliverandGitHub 0bb8c0a1e3 Merge pull request #1128 from SchrodingersGat/settings-improvements 
Improve settings.py
 2020-11-13 15:32:48 +11:00
Oliver Walters f0777ead92 Removed eprint statements 2020-11-13 14:39:28 +11:00
Oliver Walters 0f42916521 Improve settings.py 
- Load database config from either config.yaml or environment variables
- Mix and match, if you want!
- Move to use logging module rather than just printing stuff
- Error if required database parameters are not required
 2020-11-13 13:38:01 +11:00
Oliver Walters ee70e27f7d Change function name 2020-11-13 13:21:43 +11:00