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,168 Commits 9 Branches 164 Tags
28fb1b5fab64f0e279db89109490542256c39421
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub ab9a6bd3c4 Merge pull request #1211 from SchrodingersGat/attachment-api 
Filter PartAttachment API list by Part reference
 2021-01-08 12:22:59 +11:00
Oliver Walters 59bb5d15c8 Filter PartAttachment API list by Part reference 2021-01-08 08:43:00 +11:00
OliverandGitHub 5666db6b7a Merge pull request #1208 from SchrodingersGat/calendar 
Add fullcalendar javascript library
 2021-01-08 00:04:16 +11:00
Oliver Walters 75f31ecc63 Update translations 2021-01-07 23:50:34 +11:00
Oliver Walters 47b0f40e97 Calendar view for build orders 2021-01-07 23:41:54 +11:00
Oliver Walters 76c86e7b2f Calendar view for purchase orders 2021-01-07 23:04:00 +11:00
Oliver Walters 38b6367453 PEP fixes 2021-01-07 22:34:17 +11:00
Oliver Walters b7203f0ebb Switch between calendar and list view for sales orders 2021-01-07 22:32:17 +11:00
Oliver Walters 5f6442ba6b Render sales orders to a calendar view 2021-01-07 18:47:29 +11:00
Oliver Walters b4277e09e8 Add fullcalendar javascript library 2021-01-07 14:21:32 +11:00
OliverandGitHub c377fb7b0c Merge pull request #1205 from SchrodingersGat/hide-report-button 
Rearrange button options for StockItem
 2021-01-07 00:34:23 +11:00
Oliver Walters bb72658e76 Rearrange button options for StockItem 2021-01-07 00:18:18 +11:00
OliverandGitHub 735a3d2eb2 Merge pull request #1202 from SchrodingersGat/stock-expiry 
StockItem expiry date
 2021-01-06 23:51:18 +11:00
Oliver Walters 7ac7e8f969 Fixed unit test 2021-01-06 23:38:01 +11:00
Oliver Walters a8e3e6c8db Update translation 2021-01-06 23:12:52 +11:00
Oliver Walters e5b346e7fa PEP fixes 2021-01-06 23:09:26 +11:00
Oliver Walters 1d6a049c5a Annotate stock queryset with stale status 2021-01-06 23:06:49 +11:00
Oliver Walters a5b18640af Display stale stock on index page 2021-01-06 22:30:12 +11:00
Oliver Walters e62873a650 Display "stale" status on StockItem info page 2021-01-06 22:21:18 +11:00
Oliver Walters ba915da22b Filter StockItem API by staleness 2021-01-06 22:20:54 +11:00
Oliver Walters 33d6396a4e Exclude expired stock from builds 2021-01-06 21:00:45 +11:00
Oliver Walters 580e7599a0 Prevent expired stock from being added to a sales order 2021-01-06 20:22:56 +11:00
Oliver Walters 9b086560cb Hide "expiry_date" column in Stock table if feature not enabled 2021-01-06 12:09:48 +11:00
Oliver Walters d0fb69e67d Add option to enable / disable stock expiry feature 
- Simply hides fields in form views
 2021-01-05 08:50:07 +11:00
Oliver Walters 1335c85de1 Edit new stock settings on settings page 2021-01-05 00:59:10 +11:00
Oliver Walters 855098e30b Merge conflicting migration files 2021-01-05 00:58:48 +11:00
Oliver Walters e715ea5d79 Merge remote-tracking branch 'inventree/master' into stock-expiry 
# Conflicts:
#	InvenTree/common/models.py
 2021-01-05 00:58:32 +11:00
Oliver Walters 213d6550d3 Add new setock settings 2021-01-05 00:54:05 +11:00
Oliver Walters 9a30108b75 Auto-update the expiry date in the StockItem form when switching Part selection 2021-01-05 00:37:42 +11:00
Oliver Walters 9dc9c0fcb7 Auto-populate expiry date for stockitem when created via the API 
(Now with unit testing!)
 2021-01-05 00:21:26 +11:00
Oliver Walters da02ab3eac Add unit testing for view 2021-01-05 00:01:44 +11:00
Oliver Walters 7d7d5d24cc Pre-fill stockitem expiry date in CreateStockItem form 2021-01-04 23:40:51 +11:00
Oliver Walters 37dcf1c1cf Add "default_expiry" field to Part model 2021-01-04 23:36:11 +11:00
Oliver Walters 692cee113c Display "expiry date" column in stock table 2021-01-04 23:11:35 +11:00
Oliver Walters 4d7c60a130 Add "expired stock" table to index page 2021-01-04 09:46:14 +11:00
Oliver Walters d1ce0f062e Improve unit testing for StockItem API 2021-01-04 01:22:43 +11:00
Oliver Walters a0c95579b4 Display expiry status on StockItem page 
- Also adds ability to filter Stock table by expired status
 2021-01-04 00:21:47 +11:00
Oliver Walters 39b9dcfec9 Add 'expired' flag to StockItem serializer 2021-01-04 00:21:21 +11:00
Oliver Walters 1a930f7f80 Add ability to edit expiry_date for StockItem 2021-01-04 00:20:02 +11:00
Oliver Walters 6d4c81e68b Add ability to filter by 'expired' status in API 2021-01-04 00:19:48 +11:00
Oliver Walters 07cda765f0 Add "expiry_date" field to StockItem model 
- Also adds "is_expired" function
 2021-01-03 23:56:35 +11:00
OliverandGitHub bc72cd612e Merge pull request #1201 from SchrodingersGat/settings 
Settings Improvements
 2021-01-03 23:47:35 +11:00
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
OliverandGitHub fe3d4a9867 Merge pull request #1200 from SchrodingersGat/supplier-part-import 
SupplierPart import/export fixes
 2021-01-03 23:08:05 +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
Oliver Walters 8e9c976e99 Update translations 2021-01-03 22:18:08 +11:00
Oliver Walters 2a91bb0c87 Update SupplierPart model to allow data importing 
- django-import-export plugin seems to require null=True for char fields
- yes, this goes against django "best practice"
- Hopefully a better solution can be found
 2021-01-03 22:16:32 +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