inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-21 14:13:06 +00:00
Code Activity
1,932 Commits 10 Branches 164 Tags
03a42fa36003d228c6af4a8da111b3b68db30a01
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 03a42fa360 Merge pull request #523 from SchrodingersGat/template-badge 
Display template badge in part table
 2019-09-13 21:04:19 +10:00
Oliver Walters c8be9cb90c Display template badge in part table 2019-09-13 20:58:17 +10:00
OliverandGitHub 5672c37c9f Merge pull request #520 from SchrodingersGat/bom-item-edit 
Improve BomItem editing form
 2019-09-13 16:29:54 +10:00
Oliver Walters 567826165c Improve BomItem editing form 
- Don't allow duplication of an item already in the BOM
- Remove the parent part from the BOM
 2019-09-13 16:26:44 +10:00
OliverandGitHub 8fcc1b8448 Update version.py 
Bumped to v0.0.6
 2019-09-13 15:54:12 +10:00
OliverandGitHub 21b205aeb1 Merge pull request #518 from SchrodingersGat/doc-fix 
cd to the correct directory to run the dev server
 2019-09-13 15:53:41 +10:00
Oliver Walters 205567cfb4 cd to the correct directory to run the dev server 2019-09-13 15:47:34 +10:00
OliverandGitHub 2e3ee23d8d Merge pull request #517 from SchrodingersGat/po-bug-fix 
Bug fix for order-parts form
 2019-09-13 15:37:55 +10:00
Oliver Walters 17e91493ea Bug fix for order-parts form 
- Check for parts already existing in PO must filter by the purchase order ID in addition to the part ID
 2019-09-13 15:32:52 +10:00
OliverandGitHub c34f6d9268 Merge pull request #516 from SchrodingersGat/tree-name-fix 
Tree name fix
 2019-09-13 11:19:34 +10:00
Oliver Walters 8716281f7e Add unit test for invalid characters 2019-09-13 11:15:54 +10:00
Oliver Walters 844f337d64 Fix ValidationError call for validate_tree_name function 2019-09-13 11:15:11 +10:00
OliverandGitHub afdea818f7 Merge pull request #510 from SchrodingersGat/delete-lead-time 
Remove lead-time field
 2019-09-12 22:45:58 +10:00
Oliver Walters 91453094aa Remove lead-time field 2019-09-12 22:37:09 +10:00
OliverandGitHub 7326146c19 Merge pull request #509 from SchrodingersGat/delete-supplier 
Hide dropdown-menu for functionality that does not yet exist
 2019-09-12 22:17:53 +10:00
Oliver Walters 61d2ce67ef Hide dropdown-menu for functionality that does not yet exist 2019-09-12 22:01:18 +10:00
OliverandGitHub fc761d2334 Merge pull request #508 from SchrodingersGat/price-break-buttons 
Fix buttons for edit/delete supplier price break
 2019-09-12 21:57:16 +10:00
Oliver Walters 31625aa4bb Fix buttons for edit/delete supplier price break 2019-09-12 21:53:29 +10:00
OliverandGitHub 62c9e85add Merge pull request #503 from SchrodingersGat/install-bugs 
Fixes for migrate target in makefile
 2019-09-10 14:46:58 +10:00
Oliver Walters f5d26a83f5 Fixed cwd for .travis.yml 2019-09-10 14:40:29 +10:00
Oliver Walters 73749911f8 Fixed typo 2019-09-10 14:37:03 +10:00
Oliver Walters b9109cf684 Travis CI tests superuser creation 2019-09-10 14:32:29 +10:00
Oliver Walters 4daf1ae8d4 Fixes for migrate target in makefile 2019-09-10 14:18:20 +10:00
OliverandGitHub 927160c77f Create CONTRIBUTING.md 2019-09-10 10:33:44 +10:00
OliverandGitHub 17a9722263 Merge pull request #497 from SchrodingersGat/part-export 
Part export
 2019-09-09 20:06:28 +10:00
Oliver Walters 4dc7da41b9 pepper 2019-09-09 20:02:52 +10:00
Oliver Walters ddb041fe44 Filter by category too 2019-09-09 19:59:56 +10:00
Oliver Walters 776fc8b1e5 Add 'used_in' count to part export 2019-09-09 19:37:59 +10:00
Oliver Walters 8723a6c219 Add 'purchaseable' field to part export 2019-09-09 19:10:57 +10:00
OliverandGitHub a2705bbe73 Merge pull request #496 from SchrodingersGat/postgresql 
Update docs for installing with PostgreSQL
 2019-09-09 16:19:25 +10:00
Oliver Walters ee73ea714e Update docs for installing with PostgreSQL 
- make target
- documentation
 2019-09-09 16:11:26 +10:00
OliverandGitHub e4dcbd2fda Update version.py 
Bump version num
 2019-09-09 14:25:00 +10:00
OliverandGitHub b2c9be1bcd Merge pull request #494 from SchrodingersGat/update-fix 
Ensure that required packages are installed when performing update step
 2019-09-09 14:24:32 +10:00
Oliver Walters da5f2338eb Ensure that required packages are installed when performing update step 2019-09-09 14:14:38 +10:00
OliverandGitHub f5e34bef7e Merge pull request #492 from SchrodingersGat/fix 
Fix uniqueness test for stock item
 2019-09-09 08:53:20 +10:00
Oliver Walters 53c5324df6 Fix uniqueness test for stock item 2019-09-09 08:49:27 +10:00
OliverandGitHub f9ae0f83d1 Merge pull request #491 from SchrodingersGat/improvement 
Improvement
 2019-09-09 08:34:39 +10:00
Oliver Walters fb2c347fd4 Removed unused import 2019-09-09 08:30:24 +10:00
Oliver Walters 9c988310b6 Add tests for MPTT models 2019-09-09 08:29:36 +10:00
Oliver Walters 108382cc89 Prefecth related data for stock export 
- Example export reduced from 1,024 queries to 7
 2019-09-09 08:17:26 +10:00
OliverandGitHub d8a3c7a81d Merge pull request #489 from SchrodingersGat/export-stocktake 
Export stocktake
 2019-09-09 00:05:05 +10:00
Oliver Walters 11c946be4d Export human-readable status code 2019-09-09 00:02:08 +10:00
Oliver Walters fff42e7dbb Export stock based on part 2019-09-08 23:58:40 +10:00
Oliver Walters 231a669fe5 Export stock based on supplier 2019-09-08 23:53:09 +10:00
Oliver Walters 3d5542181a Move "Export" button onto stock table 2019-09-08 23:40:51 +10:00
Oliver Walters e81a4ffacd Add docs for common modules 2019-09-08 23:36:25 +10:00
Oliver Walters 8817b4d692 Icer button rendering for PurchaseOrder page 2019-09-08 23:27:54 +10:00
Oliver Walters fa8056f4b9 Fill out supplier_part details when receiving a line for a purchase order 2019-09-08 23:15:44 +10:00
Oliver Walters 9212d6047f Add supplier information to exported data 2019-09-08 23:10:13 +10:00
Oliver Walters cc452bc270 Export stock data 2019-09-08 23:01:16 +10:00
Oliver Walters faf8b9f2f0 Form / view for downloading stocktake info 2019-09-08 22:37:27 +10:00
Oliver Walters f4e71d6055 Add a buttony-boy 
(cherry picked from commit 69ac5d870a2f1bc9589cd9b23212d3b51cf92c80)
 2019-09-08 20:55:19 +10:00
Oliver Walters 2c969ef1c6 View for exporting stocktake / stock list 
(cherry picked from commit bdad2d6178a14322ef225d08b13db86b6d7d0909)
 2019-09-08 20:55:06 +10:00
OliverandGitHub 2f47140e0f Merge pull request #488 from SchrodingersGat/mptt 
Mptt
 2019-09-08 20:51:11 +10:00
Oliver Walters 026108803e More links in the about page 2019-09-08 20:48:33 +10:00
Oliver Walters d7f969613e Update makefile and docs 2019-09-08 20:45:01 +10:00
Oliver Walters e4fc44c135 More test 2019-09-08 20:36:51 +10:00
Oliver Walters 2a203be5cc Tests for part parameters 2019-09-08 20:18:21 +10:00
Oliver Walters 35ebc69235 Backup database as part of the migration process 2019-09-08 19:43:10 +10:00
Oliver Walters dac61eafa2 Fixed tests 
- Tree classes now need extra configuration in the fixture
- Check for null pk when cleaning a tree node
 2019-09-08 19:41:54 +10:00
Oliver Walters a5189b8f3f Replace a recursive function 2019-09-08 19:28:40 +10:00
Oliver Walters 0d6a3d3b28 BOM table now refreshes the table rather than the page 2019-09-08 19:24:47 +10:00
Oliver Walters b554af5f10 Fix display of location list 2019-09-08 19:21:40 +10:00
Oliver Walters 3eb3c43e5c Change foreign keys to TreeForeignKey 2019-09-08 19:19:39 +10:00
Oliver Walters 678157aac4 Update StockLocation and PartCategory models 
- Use the MPTT functionality once more
 2019-09-08 19:13:13 +10:00
Oliver Walters 4d7fba9f14 Replace tree functionality with MPTT goodness 2019-09-08 18:57:48 +10:00
Oliver Walters 2f11fccb73 Migrate InvenTreeTree to using MPTT model 2019-09-08 14:08:49 +10:00
Oliver Walters b3a5dbb5db Add django-mptt as a requirement 
(cherry picked from commit 8c33a9fca11ad9af9c9f1c6ddf2a9dab8d71e2e4)
 2019-09-08 14:02:30 +10:00
OliverandGitHub ce706aab9e Merge pull request #485 from SchrodingersGat/token-tests 
Tests for retrieving user auth tokens
 2019-09-08 00:37:16 +10:00
Oliver Walters baf096b3e7 Ensure token validation is working correctly 2019-09-08 00:28:12 +10:00
Oliver Walters 576226ad30 Tests for retrieving user auth tokens 2019-09-07 23:41:15 +10:00
OliverandGitHub dfb0f67b87 Merge pull request #484 from SchrodingersGat/leven 
Install package for fast string matching
 2019-09-07 23:40:28 +10:00
Oliver Walters 32f606627d Special display case for base currecny 2019-09-07 22:43:39 +10:00
Oliver Walters f24496c5a2 Enforce at least one base currency to be selected 2019-09-07 22:42:08 +10:00
Oliver Walters 654fbc3847 Ensure migrations are always called from the correct directory 2019-09-07 22:41:57 +10:00
Oliver Walters e1ef7174f9 Install package for fast string matching 
- But really, mostly to supress a warning!
 2019-09-07 22:33:35 +10:00
OliverandGitHub 27798cd4ad Merge pull request #482 from SchrodingersGat/tweakies 
Various UI Tweaks
 2019-09-07 21:22:32 +10:00
Oliver Walters 023c386f5e Display a warning message if delete_on_deplete is set 2019-09-07 21:18:32 +10:00
Oliver Walters b4bbd43bae Fix 404 if a stock item is completely depleted 2019-09-07 21:15:14 +10:00
Oliver Walters efc08f6824 Improve table sorting for company list 2019-09-07 20:47:02 +10:00
OliverandGitHub dd5ca32e8e Merge pull request #481 from SchrodingersGat/settings 
Improve settings view
 2019-09-07 20:37:03 +10:00
OliverandGitHub daa5a32440 Merge pull request #447 from rrakso/feature/add_method_to_delete_token 
Feature/add method to delete token
 2019-09-07 20:36:39 +10:00
Oliver Walters 446b342480 Add pagination to tables 2019-09-07 20:32:22 +10:00
Oliver Walters c45fcb45cf Delete a part parameter template from the settings view 2019-09-07 20:30:51 +10:00
Oliver Walters 42ade0e0b7 Edit part parameter template from settings view 2019-09-07 20:28:38 +10:00
Oliver Walters 55669c79c2 Delete a currency from the currency settings view 2019-09-07 20:22:30 +10:00
Oliver Walters 3188b0ab18 Edit currency from settings view 2019-09-07 20:19:35 +10:00
Oliver Walters 31562826f4 Add modal form for creating a new currency 2019-09-07 20:06:04 +10:00
Oliver Walters 67ea0fa887 Create a new part parameter template 2019-09-07 19:53:47 +10:00
Oliver Walters 94ab7c5b0e Display list of part parameter templates in the part settings page 2019-09-07 19:45:36 +10:00
Oliver Walters f415e2040e API endpoint for PartParameter and PartParameterTemplate 2019-09-07 19:44:10 +10:00
Oliver Walters 13270617b9 Ensure PartParameterTemplate name is unique 2019-09-07 19:43:41 +10:00
Oliver Walters 6752bdc1c6 Sort currency API 2019-09-07 19:28:20 +10:00
Oliver Walters 873faee040 Display currency list under currency settings page 2019-09-07 19:23:58 +10:00
Oliver Walters 9726ea4f99 Add serializer / API for currency objects 2019-09-07 19:18:18 +10:00
Oliver Walters 89c3ab5e99 Formatting 2019-09-07 18:58:37 +10:00
Oliver Walters 27878d2d8d Split settings into multiple pages 
- Tab style navigation
 2019-09-07 18:02:03 +10:00
Oliver Walters 1b8fb4db44 Start skeleton for better settings page 2019-09-07 15:04:18 +10:00
OliverandGitHub 9a61ba4e1e Merge pull request #479 from SchrodingersGat/hide-sellable 
Hide the 'sellable' tag for now
 2019-09-07 14:25:33 +10:00
Oliver Walters 9c864aa619 Hide the 'sellable' tag for now 
- Keep hidden until parts can actually be sold
 2019-09-07 10:51:39 +10:00