inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-03 12:13:02 +00:00
Code Activity
1,879 Commits 7 Branches 165 Tags
2f47140e0f377a03079150b9fcb970dc348accdd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OliverandGitHub e9ba51da52 Merge pull request #478 from SchrodingersGat/show-batch 
Display batch information in stock table
 2019-09-07 10:44:15 +10:00
Oliver Walters 8703ee90c6 Improve grouping 2019-09-07 10:41:22 +10:00
Oliver Walters 910d9a15f6 Display batch information in stock table 2019-09-07 10:39:48 +10:00
OliverandGitHub b3be5ca5a0 Merge pull request #474 from SchrodingersGat/qr-png 
Fixes
 2019-09-06 13:19:19 +10:00
Oliver Walters dac1264878 Fixed unit tests 2019-09-06 12:48:31 +10:00
Oliver Walters 9bde8bde66 Tree items dispaly description in __str__ representation 2019-09-06 12:40:04 +10:00
Oliver Walters eb378e5e5d Specify PNG image for QR code generation 2019-09-06 12:38:09 +10:00
OliverandGitHub 4ff7920296 Merge pull request #473 from SchrodingersGat/attachment-buttons 
Bug fix
 2019-09-05 20:30:25 +10:00
Oliver Walters 38b88e44bd Bug fix 2019-09-05 20:22:47 +10:00
OliverandGitHub 7642a1bb7b Merge pull request #472 from SchrodingersGat/default-loc 
Add new option to move-stock form
 2019-09-05 20:09:47 +10:00
Oliver Walters 7fd4359007 Add new option to move-stock form 
- Set the destination as the default location for parts being moved
 2019-09-05 19:59:00 +10:00
OliverandGitHub 8fe7284173 Merge pull request #471 from SchrodingersGat/bom-checksum 
Bom checksum
 2019-09-05 19:42:11 +10:00
Oliver Walters 7659f2de7b Click button to validate BOM item 2019-09-05 19:34:58 +10:00
Oliver Walters 37d9c59a0e Add API endpoint for validating a BOM item 2019-09-05 19:29:51 +10:00
Oliver Walters 81f5714cb1 BOM table now displays which lines have been marked as valid 2019-09-05 14:15:58 +10:00
Oliver Walters 1ea7bdf843 Add a note 2019-09-05 13:12:49 +10:00
Oliver Walters 0508c2dcaf Use the hash for each line item to calculate the total BOM hash 2019-09-05 13:10:26 +10:00
Oliver Walters 7671eb2b22 Add a checksum field to the bom line item 2019-09-05 12:58:11 +10:00
OliverandGitHub c96c4d16a3 Merge pull request #469 from SchrodingersGat/update-docs 
Add documentation on perfoming system upgrades
 2019-09-04 10:56:57 +10:00
Oliver Walters 7ef2932f38 Add documentation on perfoming system upgrades 2019-09-04 10:54:15 +10:00
OliverandGitHub ecd1681585 Merge pull request #468 from SchrodingersGat/currency-quote 
Currency quote
 2019-09-03 23:16:12 +10:00
Oliver Walters e903c1858f PEP 2019-09-03 22:45:45 +10:00
Oliver Walters 20b37a2d11 Test fixes 2019-09-03 22:45:11 +10:00
Oliver Walters 41806089e3 Select the default currency if one is not specifically selected 2019-09-03 22:33:50 +10:00
Oliver Walters 3682e9b5fb Display currency selection in part pricing dialog 2019-09-03 22:28:53 +10:00
Oliver Walters 7314f33d6d Add currency selection field for price calculation form 2019-09-03 22:00:43 +10:00
OliverandGitHub 8ae19cb095 Merge pull request #467 from SchrodingersGat/version 
Bump version number
 2019-09-03 10:41:49 +10:00
Oliver Walters 0325f042b5 Bump version number 2019-09-03 09:59:14 +10:00
OliverandGitHub a6ee3a59a0 Merge pull request #466 from SchrodingersGat/currency 
Currency
 2019-09-03 09:58:22 +10:00
Oliver Walters af8a96e080 Add option to edit currency 2019-09-03 09:55:15 +10:00
Oliver Walters 09cb82cdc0 Fix converted_cost 
- Incompatibility between float and decimal
 2019-09-03 09:46:32 +10:00
Oliver Walters c6a435eba0 Add currency field to SupplierPriceBreak 2019-09-03 09:34:32 +10:00
Oliver Walters 9f91797f42 Simple test case for currency 2019-09-03 09:19:37 +10:00
Oliver Walters 32d09d2d37 Add default value for currency 2019-09-03 09:10:36 +10:00
Oliver Walters 7824b8561d Create a currency model 2019-09-03 09:07:03 +10:00
Oliver Walters aeb25e4c34 startapp common 2019-09-03 08:30:14 +10:00
OliverandGitHub 9f87963fa9 Merge pull request #465 from SchrodingersGat/bug-squashin 
Squashin' some bugs
 2019-09-02 22:21:44 +10:00
Oliver Walters 273412b63d Add 'bug report' button 2019-09-02 22:14:50 +10:00
Oliver Walters f3e161564d Fix for serialization of company images 2019-09-02 22:06:42 +10:00
OliverandGitHub 64278523f0 Merge pull request #463 from SchrodingersGat/install-reqs 
Install reqs
 2019-09-02 18:03:47 +10:00
Oliver Walters c988f9486e Re-order docs index 2019-09-02 17:59:10 +10:00
Oliver Walters 90254d1572 add a note about file encoding 2019-09-02 17:46:42 +10:00
Oliver Walters 37507f2b43 More cleanup of docs 2019-09-02 17:43:20 +10:00
Oliver Walters 47e9c44c43 Prefix correct directory in docs 2019-09-02 17:04:44 +10:00
Oliver Walters b0c420858b Comments for settings.py 2019-09-02 16:44:01 +10:00
Oliver Walters 92940f1333 Update makefile docs 2019-09-02 16:05:26 +10:00
Oliver Walters d30cad2341 Emphasis on config.yaml 2019-09-02 16:05:19 +10:00
Oliver Walters 31f3ead5dc Andrew's eagle eyes 2019-09-02 15:52:19 +10:00
Oliver Walters 4de12033bb Change pip3 to python3-pip 2019-09-02 15:51:58 +10:00
OliverandGitHub 0be54a762f Merge pull request #459 from SchrodingersGat/build-tracking 
Add a reference to a build for a stock item
 2019-09-01 23:31:08 +10:00
Oliver Walters 906766cc0e Bug fix - ensure pk is set to None 2019-09-01 23:28:28 +10:00
Oliver Walters 7db938eda0 Show the build item on the stock-item page (if applicable) 2019-09-01 23:24:27 +10:00
Oliver Walters c45c4e236e Point new stockitem to the correct build 2019-09-01 23:18:28 +10:00