Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,380 Commits 6 Branches 99 Tags 484 MiB
4256d09e80
Commit Graph

2380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
4a2fa36e30 Allow 'notes' field in Part object to be blank 2020-02-23 20:02:33 +11:00
Oliver
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
Oliver
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
Oliver
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
dependabot[bot]
8a42d9f2fa
Bump django from 2.2.9 to 2.2.10 
Bumps [django](https://github.com/django/django) from 2.2.9 to 2.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.9...2.2.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-12 03:32:31 +00:00
Oliver
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
Oliver
f03f6c4386
Merge pull request #644 from SchrodingersGat/supplier-part-tabs 
Supplier part tabs
 2020-02-12 12:55:54 +11:00
Oliver
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
dependabot[bot]
05f7b30ab0
Bump django from 2.2.9 to 2.2.10 
Bumps [django](https://github.com/django/django) from 2.2.9 to 2.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.9...2.2.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-12 00:09:16 +00: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
Oliver
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
Oliver Walters
53d1040875 Fix allocation count 2020-02-12 08:14:04 +11:00
Oliver Walters
5ae7ca71d7 Improve number rendering of build allocation page 2020-02-12 08:12:26 +11:00
Oliver Walters
564635c368 Add some translatable strings 2020-02-12 08:11:59 +11:00
Oliver
31d6c77143
Merge pull request #641 from SchrodingersGat/cascading-bom 
Provide form for user to select export options
 2020-02-11 22:47:11 +11:00
Oliver Walters
882bda46b4 Fix tests 2020-02-11 22:38:50 +11:00
Oliver Walters
f865573e48 Implement cascading export of BOM 2020-02-11 22:32:36 +11:00
Oliver Walters
434d084371 Provide form for user to select export options 2020-02-11 21:43:17 +11:00
Oliver
eecc435c02
Merge pull request #639 from SchrodingersGat/use-same-img 
Use same thumbnail for multiple parts
 2020-02-11 20:30:08 +11:00
Oliver Walters
55aa63dab4 Override save() method for Part model 
- Delete old thumbnails if they are no longer being used
 2020-02-11 20:27:06 +11:00
Oliver Walters
77c950a729 Fixed unit tests 2020-02-11 00:39:02 +11:00
Oliver Walters
dee47bdea8 Prevent django_cleanup from deleting part thumbs that are used elsewhere 
- Will need to implement a method for automatically deleting part thumbs...
 2020-02-11 00:29:29 +11:00
Oliver Walters
8ea1086b03 Make thumb buttons only visible on mouseover 2020-02-11 00:28:46 +11:00
Oliver Walters
e0e996a6c3 Add buttons to select or upload part images 2020-02-11 00:00:03 +11:00
Oliver Walters
d4fe83170f Select existing image and upload successfully 2020-02-10 23:48:45 +11:00
Oliver Walters
534b60d4b8 Print out MEDIA_ROOT directory if in debug mode 2020-02-10 23:43:41 +11:00