inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-19 04:50:47 +00:00
Code Activity
2,298 Commits 9 Branches 164 Tags
ccb637773f81304c311e2a9f8a7334ff66a66e73
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters ccb637773f Add item count to StockLocation serializer 2020-04-03 11:41:51 +11:00
Oliver Walters d4da6211be StockItem: filtering improvements 
- Optional 'cacade' param
- Filter by null parent
 2020-04-03 11:40:37 +11:00
Oliver Walters fb94949538 Allow StockLocation filtering of null parent 2020-04-03 11:34:42 +11:00
Oliver Walters f5150f549a Part API changes 
- Allow filtering parts with null parent (top-level category parts)
- Option to include sub-category parts or not
 2020-04-03 09:37:03 +11:00
Oliver Walters 6e65a736e7 Add isNull function to query against null keys 2020-04-03 09:31:26 +11:00
Oliver Walters d17056820b Allow PartCategory filtering by null parent 2020-04-03 09:25:58 +11:00
Oliver Walters 7e8664a4dd Include "parts" count in Category API 2020-04-03 09:15:09 +11:00
OliverandGitHub 40822a93df Merge pull request #691 from SchrodingersGat/default-currency 
auto-fill price break with default quantity
 2020-03-31 22:14:10 +11:00
Oliver Walters 67a73c1fbf auto-fill price break with default quantity 2020-03-31 22:11:16 +11:00
OliverandGitHub 9d19029ba9 Merge pull request #690 from SchrodingersGat/bug-fixes 
Bug fixes
 2020-03-31 21:43:42 +11:00
Oliver Walters c31b72bde2 type checking 2020-03-31 21:40:23 +11:00
Oliver Walters 6919eaa1e1 Update translations 2020-03-31 21:33:50 +11:00
Oliver Walters 124967ed31 Remove trailing zeros in part order form 2020-03-31 21:30:34 +11:00
Oliver Walters 570010b99c Change POLineItem quantity to a rounding decimal field 2020-03-31 21:23:57 +11:00
Oliver Walters 4c96b34c7c Override prepare_value method of RoundingDecimalFormField 
- Remove trailing zeros in form field display
 2020-03-31 21:21:39 +11:00
Oliver Walters f07f3b99cf Remove 'notes' field from PurchaseOrder edit / create form 2020-03-31 20:48:44 +11:00
OliverandGitHub cdc4c5d6d5 Merge pull request #684 from SchrodingersGat/build-status-label-fix 
Display proper build status label
 2020-03-30 17:18:46 +11:00
Oliver Walters 34c097c46a Display proper build status label 2020-03-30 16:48:14 +11:00
OliverandGitHub e28fe6df6a Merge pull request #682 from SchrodingersGat/low-stock 
"Low Stock" badge
 2020-03-30 15:35:53 +11:00
Oliver Walters 0dc6d9d37e Improved visual layout 2020-03-30 15:04:56 +11:00
Oliver Walters 5aec3df7c9 Add stock-info labels to Part info page 2020-03-30 13:37:34 +11:00
Oliver Walters 06f28898a0 separate display for "no stock" and "low stock" in list view 2020-03-30 13:31:14 +11:00
Oliver Walters e8e0ab8416 Include 'minimum_stock' information in part list api 2020-03-30 13:21:33 +11:00
OliverandGitHub 00eada2c3c Merge pull request #679 from SchrodingersGat/on-order-fix 
Better filtering of annotations for Part-list API
 2020-03-26 18:07:53 +11:00
Oliver Walters c0650ba7f4 Add "buiding" icon in part list if no stock and none on order 2020-03-26 17:57:49 +11:00
Oliver Walters 713d7960a8 Fix on_order calculation 
- Take into account the number "received"
- Also fix unit tests
 2020-03-26 17:56:44 +11:00
Oliver Walters 6a78f6d451 Include quantity currently being build in Part API 2020-03-26 17:43:02 +11:00
Oliver Walters 41bbbdcd43 Improve query speed when calculating how many parts are on order 2020-03-26 17:31:59 +11:00
Oliver Walters 57123283f4 Better filtering of annotations for Part-list API 2020-03-26 17:08:01 +11:00
OliverandGitHub 864a21ac85 Merge pull request #678 from SchrodingersGat/on-order 
Add "On Order" badge
 2020-03-26 14:53:54 +11:00
Oliver Walters 99efbd4c40 If a part has no stock but is on order, display an "on-order" badge 2020-03-26 14:46:40 +11:00
Oliver Walters dae45875fb Add 'on_order' quantity to the part list API 2020-03-26 14:46:23 +11:00
OliverandGitHub d0f71ea6de Merge pull request #676 from maxbachmann/master 
use rapidfuzz instead of fuzzywuzzy
 2020-03-23 09:18:38 +11:00
OliverandGitHub c6f069028c Update version.py 
bump version number
 2020-03-22 20:19:16 +11:00
OliverandGitHub b6bc5e3bff Merge pull request #675 from SchrodingersGat/po-attachment 
Po attachment
 2020-03-22 20:18:09 +11:00
Oliver Walters 25caec4c53 Fix unit testings 2020-03-22 20:13:38 +11:00
OliverandGitHub 7d095213a5 Merge pull request #646 from inventree/dependabot/pip/django-2.2.10 
Bump django from 2.2.9 to 2.2.10
 2020-03-22 20:13:18 +11:00
Oliver Walters 672119fb92 Update README.md 2020-03-22 20:07:36 +11:00
Oliver Walters 7f269898c4 Flake - ignore media and static dirs 2020-03-22 20:02:13 +11:00
Oliver Walters 82be9db3df Make a fancy badge 2020-03-22 19:57:51 +11:00
Oliver Walters 90aa205057 Update translations 2020-03-22 19:57:37 +11:00
Oliver Walters 4a259dc146 Can now successfully edit or delete a purchase-order attachment 2020-03-22 19:55:46 +11:00
Oliver Walters 5af2fae120 Simplify URLs for purchase orders 2020-03-22 19:47:08 +11:00
Oliver Walters 834f80698b Create a new attachment against a PurchaseOrder 2020-03-22 18:41:41 +11:00
Oliver Walters 56a6943438 Add an 'attachment' page for the PurchaseOrder view 2020-03-22 18:13:34 +11:00
Oliver Walters cc41752f9f Add PurchaseOrderAttachment model 
- File attachment against PurchaseOrder
 2020-03-22 18:02:53 +11:00
Oliver Walters a661d7e1a6 Abstract the PartAttachment class 
Now "Attachments" are much easier to implement for different models
 2020-03-22 17:59:23 +11:00
OliverandGitHub 3b6ed585ab Merge pull request #671 from SchrodingersGat/allocation-add 
Bugfix: Build Allocation
 2020-03-19 10:29:00 +11:00
Oliver Walters 01f1ac49e3 Improve SupplierPart detail page 2020-03-19 10:23:41 +11:00
Oliver Walters 5207b2ba21 Add build status label to part detail 2020-03-19 10:20:09 +11:00
Oliver Walters 6fd0380196 Display item overage in the allocation list 2020-03-19 10:16:58 +11:00
Oliver Walters 15bc457714 Improve calculation of BOM item overage 2020-03-19 10:15:43 +11:00
Oliver Walters 3fd0cf67b6 Fix summation of build allocation items 2020-03-19 09:01:22 +11:00
OliverandGitHub daa8496157 Merge pull request #669 from SchrodingersGat/round-fix 
Implement auto-rounding decimal field
 2020-03-19 08:47:29 +11:00
OliverandGitHub 1259cea2c3 Merge pull request #668 from SchrodingersGat/part-creation-details 
Part creation details
 2020-03-18 22:23:35 +11:00
Oliver Walters 6731bc1b06 Implement auto-rounding decimal field 
Ref: https://stackoverflow.com/questions/37958130/automatically-round-djangos-decimalfield-according-to-the-max-digits-and-decima
 2020-03-18 22:22:40 +11:00
Oliver Walters d51ac2f5c2 Save creation user when making a new part via the API 2020-03-18 22:00:32 +11:00
Oliver Walters a147ce4284 Save the current user when creating a new part 2020-03-18 21:53:02 +11:00
Oliver Walters 8186e4bab0 Display creation information in part detail page 2020-03-18 21:50:38 +11:00
Oliver Walters 2b08b0f2b9 Add new fields for Part object 
- Creation date
- Creation user
- Responsible user
 2020-03-18 21:50:18 +11:00
OliverandGitHub febd1ad4a7 Merge pull request #667 from SchrodingersGat/hide-template-parts 
Limit choices for Part selection
 2020-03-18 21:32:29 +11:00
Oliver Walters 8eaaf62eda Limit choices for Part selection 
Based on is_template / virtual / active status
 2020-03-18 21:28:11 +11:00
OliverandGitHub b2cb41f879 Merge pull request #666 from SchrodingersGat/build-allocation 
Build allocation fix
 2020-03-18 21:07:44 +11:00
Oliver Walters c04aa1bff7 Increase unit testing for BOM item model 2020-03-18 21:04:37 +11:00
Oliver Walters 3b9f57fc80 Bug fix - Multiplying float by decimal 
- Overage percentage now uses explicit decimal multiplication
 2020-03-18 20:44:45 +11:00
Oliver Walters 33ffa2f75f Add option to make stock-table read-only 
- Default table is not read-only
 2020-03-18 20:37:25 +11:00
OliverandGitHub 1fa4e7f5fb Merge pull request #658 from SchrodingersGat/part-notes-fix 
Allow 'notes' field in Part object to be blank
 2020-02-23 20:06:26 +11:00
Oliver Walters 4a2fa36e30 Allow 'notes' field in Part object to be blank 2020-02-23 20:02:33 +11:00
OliverandGitHub 6c415bc922 Merge pull request #653 from SchrodingersGat/stock-item-tree 
Stock item tree
 2020-02-19 00:02:59 +11:00
Oliver Walters 068c237c6e remove failing test 2020-02-18 23:59:37 +11:00
OliverandGitHub 826102e10e Merge pull request #654 from SchrodingersGat/error-fix 
Catch a ProgrammingError if table does not exist
 2020-02-18 11:13:44 +11:00
Oliver Walters 066d69215f Catch a ProgrammingError if table does not exist 2020-02-18 10:44:01 +11:00
Oliver Walters 49118d8083 Do not let a StockItem be deleted if child items exist 2020-02-18 10:41:06 +11:00
Oliver Walters 49d5573f8b Bug fix: Update child/parent relationship when a StockItem is deleted 
- Pass the child items up to the parent of the deleted item
- Fix unit tests
 2020-02-18 08:42:55 +11:00
Oliver Walters 9e456f5a11 Flake fix 2020-02-18 08:15:05 +11:00
Oliver Walters 0f4d60dceb StockItem LIST API can now be filtered by StocKItem status 2020-02-17 23:32:43 +11:00
Oliver Walters 23aebab6d0 Display list of build outputs in the Build tab 
- Allow StockList api to be filtered by Build id
 2020-02-17 23:31:23 +11:00
Oliver Walters e483b42df6 Logic fix for StockItem splitting 
- The original is left in place
- The new item is moved
 2020-02-17 22:56:54 +11:00
Oliver Walters 3715c5d637 Set the parent relationship when serializing StockItem object 
- Keep track of which StockItem is came from
 2020-02-17 22:44:41 +11:00
Oliver Walters ae4ebab957 Display table of StockItems which have been split from the current item 
- The StockItem list api now allows filtering by 'ancestor'
- Add 'children' tab for StockItem
- Needed to tweak the unit testing fixtures (yay thanks MPTT)
 2020-02-17 22:37:55 +11:00
Oliver Walters 4f266958e3 Add custom migration 
- Required to initialize the MPTT fields for the StockItem model
 2020-02-17 22:11:44 +11:00
Oliver Walters 750dfcda07 Add 'parent' field for StockItem 
- Allows StockItem to be tracked when it is split into multiple items
- Uses MPTT field
 2020-02-17 21:52:31 +11:00
OliverandGitHub 0071a29af7 Merge pull request #649 from SchrodingersGat/doc-fix 
Doc fix
 2020-02-16 09:32:56 +11:00
Oliver Walters 64c567474a Doc fix 2020-02-16 09:25:28 +11:00
OliverandGitHub 5261e96c8a Revert to django 2.2.9 
2.2.10 causes issues

```ModuleNotFoundError: No module named 'django.utils'```
 2020-02-12 14:32:09 +11:00
OliverandGitHub f03f6c4386 Merge pull request #644 from SchrodingersGat/supplier-part-tabs 
Supplier part tabs
 2020-02-12 12:55:54 +11:00
OliverandGitHub 0a9f2b37cf Merge pull request #645 from inventree/dependabot/pip/django-2.2.10 
Bump django from 2.2.9 to 2.2.10
 2020-02-12 12:47:03 +11:00
Oliver Walters 7dcc94b106 Filter purchaseorder API by supplier part 2020-02-12 12:44:52 +11:00
Oliver Walters 33d21594da Create new stock item from supplierpart stock page 
- Allow stock-item-create form to have supplierpart passed as initial data
- Add some translations too
 2020-02-12 11:32:01 +11:00
Oliver Walters 6d80788618 Allow stock-filtering and export using SupplierPart ID 2020-02-12 11:16:00 +11:00
Oliver Walters 8dd8505a2c More tab updates 
- Add Stock tab
- Add Stock table for supplier part
- Allow stock API to be filtered by supplier-part ID
- Add Orders tab
 2020-02-12 11:09:37 +11:00
Oliver Walters d9d21395d9 Add a 'pricing' tab for SupplierPart 2020-02-12 10:48:25 +11:00
Oliver Walters 63b70614b6 Create 'tabs' for SupplierPart view 2020-02-12 10:42:45 +11:00
OliverandGitHub 34c3320cd5 Merge pull request #642 from SchrodingersGat/rounding-fixes 
Rounding fixes
 2020-02-12 10:31:41 +11:00
Oliver Walters 50fee1bfe5 More work on translations 2020-02-12 10:25:46 +11:00
Oliver Walters 28e9d842bf Small tweaks for BOM export 
- Steps towards preventing circular BOMs
- Improve formatting of exported BOM
 2020-02-12 10:18:20 +11:00
Oliver Walters d04fb0d826 Use decimal2string instead of normalize 2020-02-12 10:08:35 +11:00
Oliver Walters 520b8d7b2b Fix for BOM pricing weirdness 2020-02-12 10:06:17 +11:00
Oliver Walters c287a0a0b9 More rounding improvements 2020-02-12 08:22:55 +11:00
Oliver Walters 265ed5115a Float parsing on StockItem tracking page 2020-02-12 08:19:08 +11:00