inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
3,142 Commits 9 Branches 164 Tags
146dae6d43101391edc9e68a21a2d5d8d7faa7c9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 146dae6d43 Toot toot - it's the refactor tractor! 
- New function for launching a CreateStockItem form
- Wraps up the previous code improvements into a single function
- Oh, the ease!
 2020-08-27 00:08:02 +10:00
Oliver Walters 4be1b2928b PEP fix 2020-08-26 23:50:49 +10:00
Oliver Walters 72899530cf Add helper function to simplify reloading of field options 2020-08-26 23:43:19 +10:00
Oliver Walters 9dcc23ee4e Hide 'supplier part' options if no part is selected in the form 2020-08-26 23:40:15 +10:00
Oliver Walters 3a75682878 Add "pretty" name to the SupplierPart API 
- Quick way to ensure the supplier part objects are printed the same way
- Use the pythonic back-end to render the data
 2020-08-26 23:23:57 +10:00
Oliver Walters 5aa11063a0 Add function to update the 'options' for a given field in a modal 2020-08-26 23:13:32 +10:00
Oliver Walters 2037474fad Option generation function now returns array, rather than flat text 2020-08-26 23:04:50 +10:00
Oliver Walters 02d17378a6 Add function to programatically generate a list of <option> elements 2020-08-26 23:02:25 +10:00
Oliver Walters 6ab34c3d0e SupplierPart - Improve API 
- The default DRF behaviour throws errors if the supplied query params do not conform to the limit_choices_to field
- This is non optimum! Don't want to have to handle these cases
- Do the filtering ourselves!
 2020-08-26 22:44:22 +10:00
Oliver Walters d44ad541eb Add "callback" functionality for modal forms when a given field is changed 
- Attach callback function
- Add a function to retrieve a field by name
 2020-08-26 22:35:36 +10:00
OliverandGitHub 0b4f732160 Merge pull request #933 from SchrodingersGat/report-select-fix 
Bugfix: Select test report template
 2020-08-26 15:03:39 +10:00
Oliver Walters 54d0c4e8a8 Bugfix: Select test report template 
- Actually, two bugs!
 2020-08-26 14:29:49 +10:00
OliverandGitHub ee0df29af0 Merge pull request #921 from eeintech/show_potential_bom_items_stock 
Show 'available_stock' in Part string representation
 2020-08-26 09:36:55 +10:00
OliverandGitHub 60c6d6d33e Merge pull request #919 from eeintech/bom_export_parameter_stock 
BoM export: added option to export part parameters (#126) and stocks (#793)
 2020-08-26 08:41:44 +10:00
OliverandGitHub 788d497e87 Merge pull request #931 from bcc/bug-serialize-no-location 
Fix internal server error when serializing stock with no location
 2020-08-25 08:38:35 +10:00
OliverandGitHub cd016d3f7d Merge pull request #930 from bcc/feature-custom-authentication 
Allow custom authentication/middleware in config.yaml
 2020-08-25 08:37:30 +10:00
OliverandGitHub 2a4b9c6c5c Merge pull request #929 from SchrodingersGat/label-enable 
Label enable
 2020-08-23 21:18:11 +10:00
OliverandGitHub c3bfcad4df Merge pull request #928 from Kedarius/small-device 
Collapse navbar on small screen
 2020-08-23 21:12:28 +10:00
Oliver Walters ca1985e11a PEP fixes 2020-08-23 21:10:45 +10:00
Oliver Walters 9a35293126 Remove PartFilterMixin class 2020-08-23 21:08:41 +10:00
Oliver Walters ed5ad3c047 Rename 'part_filters' field to 'filters' 2020-08-23 21:05:54 +10:00
Oliver Walters c849f618d5 Clean up implementation of test report matching 2020-08-23 21:03:29 +10:00
Oliver Walters b7ae95686e Add field "enabled" to Report template 2020-08-23 20:51:41 +10:00
Oliver Walters 116d966d29 Delete "ReportTemplate" class 2020-08-23 09:10:56 +10:00
Oliver Walters 771b2117c4 Remove duplicated function 2020-08-23 09:08:24 +10:00
Oliver Walters 8f1af0f5f9 Add "enabled" field to Label class 
- Only list labels which are enabled
- Allows labels to be hidden / disabled without being deleted
 2020-08-23 09:07:15 +10:00
OliverandGitHub 69a3ad3c5b Merge pull request #927 from bcc/bug-serialized-move 
Fix disabled form item from preventing location moves for serialized stock
 2020-08-22 09:13:40 +10:00
OliverandGitHub de86418ede Merge pull request #925 from SchrodingersGat/make-replace 
Change from using "make" to "invoke"
 2020-08-21 21:58:19 +10:00
Oliver Walters 017c1ece89 Update docstring 2020-08-21 21:51:22 +10:00
Oliver Walters d8f9f95cb4 Add command to run the development server 2020-08-21 21:49:03 +10:00
Oliver Walters ef1e598341 Install PIP requirements as a part of "invoke install" 2020-08-21 21:32:08 +10:00
Oliver Walters 513142d487 Update travis file 2020-08-21 21:27:39 +10:00
Oliver Walters 592e87941d Add more targets 
- superuser
- backup
 2020-08-21 21:24:02 +10:00
Oliver Walters f5fd0fc5be Migrate "mysql" and "postgresql" targets 2020-08-21 21:17:38 +10:00
Oliver Walters af50e29e2c Migrate "translate" command 2020-08-21 21:13:28 +10:00
Oliver Walters ec1e646de0 Migrate "style" task 2020-08-21 21:12:05 +10:00
Oliver Walters ab75f85555 Migrate "test" command to invoke 2020-08-21 21:10:14 +10:00
Oliver Walters 05fae4be87 Are more methods to tasks.py: 
- static
- update
- install
- key
- coverage

The functionality of setup.py is now included here!
 2020-08-21 21:08:04 +10:00
Oliver Walters f4debeac47 Moving to "invoke" framework 
- Add "migrate" test
 2020-08-21 20:39:43 +10:00
OliverandGitHub 7a0e1e9574 Merge pull request #924 from SchrodingersGat/stocktake-export-fixes 
Stocktake export fixes
 2020-08-21 20:14:02 +10:00
Oliver Walters 59b3d8b5bc Fix stocktake export 
- Exclude MPTT fields
- Fix foreignkey field references
 2020-08-21 20:08:47 +10:00
Oliver Walters 25cced3b90 Exclude MPTT fields from Part model resource 2020-08-21 20:08:16 +10:00
OliverandGitHub 852a680c09 Merge pull request #916 from SchrodingersGat/null-customer 
StockItem: Allow customer field to be blank
 2020-08-20 14:59:06 +10:00
Oliver Walters 90d34cdfcf StockItem: Allow customer field to be blank 2020-08-20 14:54:55 +10:00
OliverandGitHub 4f1b469cee Merge pull request #915 from SchrodingersGat/tex-response 
Tex response
 2020-08-20 14:14:24 +10:00
Oliver Walters 8e0dfa9c6f PEP fix 2020-08-20 14:05:55 +10:00
Oliver Walters 64ae181bf6 Add some more context data 2020-08-20 14:01:41 +10:00
Oliver Walters 5a8804f4bc If LaTeX template errors, return the raw LaTeX! 2020-08-20 13:57:29 +10:00
OliverandGitHub 71f3662ebc Merge pull request #914 from SchrodingersGat/recursive-bom 
Bugfix: Recursive BOM display
 2020-08-20 09:01:26 +10:00
Oliver Walters 0aeb7ddbdf Allow column show/hide on BOM table 2020-08-20 08:57:11 +10:00
Oliver Walters 41c4a5376b Bugfix: Recursive BOM display 
- Actually request recursively! (duh)
- Fix the idField and parentIdField for the BOM display (was incredibly wrong)
- Sub-rows are initially displayed in the "collapsed" state
 2020-08-20 08:52:22 +10:00
OliverandGitHub 8556bdec6a Merge pull request #913 from SchrodingersGat/supplier-data-in-bom 
Supplier data in bom
 2020-08-19 14:13:53 +10:00
Oliver Walters 0faba39dfc PEP: Remove unused variable 
(cherry picked from commit e49a1c1ad2)
 2020-08-19 14:08:52 +10:00
Oliver Walters 7e829e88af Add option for including supplier data for BOM export 
(cherry picked from commit d0b5550c86)
 2020-08-19 14:08:47 +10:00
Oliver Walters 3d0012a3bf Bugfix: accomodate missing manfufacturer links 
If a supplier_part does not have an associated manufacturer, the code would break

(cherry picked from commit 965dba4739)
 2020-08-19 14:08:41 +10:00
OliverandGitHub 13b64c6a04 Merge pull request #910 from SchrodingersGat/multi-level-bom 
Multi level bom
 2020-08-18 21:28:47 +10:00
Oliver Walters 1767ef7a3a Fix issues with tree sorting 
- Need to set parent ID based on the BOM items
- This is to prevent data duplication that was weird and dumb
 2020-08-18 21:24:11 +10:00
Oliver Walters 82903d2bd6 BOM display is now heirarchical 2020-08-18 21:01:22 +10:00
Oliver Walters 4cd54203a2 Add jquery-treegrid plugin 2020-08-18 20:53:50 +10:00
Oliver Walters 37baec2db6 bootstrap-table: Add "extensions" 2020-08-18 20:53:05 +10:00
OliverandGitHub 316dfe5e38 Merge pull request #909 from SchrodingersGat/bom-import-export 
BOM upload: improve generation of "import" template
 2020-08-18 14:37:48 +10:00
Oliver Walters 92ac93aac5 More intelligent checking for circular BOM 
- Check all the way down a BOM "tree"
- Validate BOM tree before allowing BOM submission
 2020-08-18 14:17:59 +10:00
Oliver Walters ca4d3df287 Update translation files 2020-08-18 14:01:40 +10:00
Oliver Walters 68fb599c73 Major improvements to BOM upload 
- Column headings now match the values provided in BOM import template
- Add a new column for part selection, while displaying all imported data
- Better code documentation
- Improve data validation
- Allow decimal quantity (not just integer!)
- Better matching logic
 2020-08-18 14:01:01 +10:00
Oliver Walters 7349b396ca Merge remote-tracking branch 'upstream/master' into bom-import-export 2020-08-18 11:50:40 +10:00
OliverandGitHub 561516e8d7 Merge pull request #908 from eeintech/bom_upload_part_match_auto_and_ipn 
BoM Upload: Automatic Part match using name or IPN
 2020-08-18 11:50:10 +10:00
Oliver Walters 476cc5f661 BOM upload: improve generation of "import" template 
- Better field naming
- Remove some fields which are not required here
- Better description of what is going to happen
 2020-08-18 11:47:27 +10:00
OliverandGitHub 89c7f72caf Merge pull request #907 from SchrodingersGat/bom-level-int 
Make BOM levels integers
 2020-08-17 10:43:31 +10:00
Oliver Walters 25d90f643a Make BOM levels integers 2020-08-17 10:39:35 +10:00
OliverandGitHub 4dcd6ee136 Update version.py 2020-08-16 14:03:49 +10:00
OliverandGitHub ab62f8fc59 Update version.py 
Increment version number
 2020-08-16 14:03:20 +10:00
OliverandGitHub b5b882d3b6 Merge pull request #906 from SchrodingersGat/blabel 
Label Printing Functionality
 2020-08-16 14:02:38 +10:00
Oliver Walters d52278e423 Icon tweak 2020-08-16 13:45:58 +10:00
Oliver Walters da079b23dc Fix duplicate label printing menu action 2020-08-16 13:43:59 +10:00
Oliver Walters ccda637e3c Fixes for barcode decoding 2020-08-16 13:42:27 +10:00
Oliver Walters a4267f76e8 Fixes for barcode data rendering 2020-08-16 13:39:05 +10:00
Oliver Walters 2bbc65cc59 Add "brief" version of QR codes 
- Use this to render to labels (as it contains much less information)
 2020-08-16 13:29:38 +10:00
Oliver Walters 2f5e3efada Update translations 2020-08-16 12:11:22 +10:00
Oliver Walters 1807ba4e7b Add form for selecting label template for a StockItem 2020-08-16 12:10:58 +10:00
Oliver Walters 30e24f19d9 PEP fixes 2020-08-16 11:13:17 +10:00
Oliver Walters cdde0f8c43 Add URL endpoint for downloading PDF labels 2020-08-16 11:12:21 +10:00
Oliver Walters 2b1d6c268c Render to an in-memory PDF 2020-08-16 10:29:03 +10:00
Oliver Walters 18b3fd3256 Add context data to StockItemLabel model 2020-08-16 10:24:15 +10:00
Oliver Walters aefd70ce49 Add admin interface for StockItemLabel 2020-08-16 09:29:45 +10:00
OliverandGitHub eb2422e6be Merge pull request #905 from SchrodingersGat/bom-depth 
Allow user to set "depth" of exported multi-level BOM
 2020-08-16 09:29:09 +10:00
Oliver Walters a45902bd4f Add "label" app 2020-08-16 09:28:12 +10:00
Oliver Walters dd77cc00b7 Add requirement for "blabel" plugin 2020-08-16 09:07:27 +10:00
Oliver Walters e5406cae24 More PEP fixes 2020-08-16 09:05:16 +10:00
Oliver Walters 97103207b6 PEP fixes 2020-08-16 08:34:54 +10:00
Oliver Walters b27ecf54d7 Allow user to set "depth" of exported multi-level BOM 2020-08-16 08:29:36 +10:00
OliverandGitHub 318c16f321 Merge pull request #904 from SchrodingersGat/query-speeds 
Significant query speed improvements to stock list API
 2020-08-15 21:56:55 +10:00
Oliver Walters f1373e3bea Improve speed of BomItem API queries 
- Including the pricing information takes absolutely ages, takes too long!!
 2020-08-15 21:52:32 +10:00
Oliver Walters e1a8772af6 Update serializers for SupplierPart 2020-08-15 21:24:01 +10:00
Oliver Walters d34383e842 Specify serializer type for part category 2020-08-15 21:20:31 +10:00
Oliver Walters 2f77007dbe Significant query speed improvements to stock list API 
- Thanks, django-debug-toolbar!
- Gah, django DRF is the worst. Enforcing a PrimaryKeyRelatedSerializer seems to really improve speed
 2020-08-15 21:15:11 +10:00
OliverandGitHub 411e7507a3 Merge pull request #903 from SchrodingersGat/debug-toolbar 
Debug toolbar
 2020-08-15 20:08:04 +10:00
Oliver Walters 3c4cfc9a1b Flake fix 2020-08-15 19:56:02 +10:00
Oliver Walters 2bb669d7de Remove defunct "log_queries" option 2020-08-15 19:52:04 +10:00
Oliver Walters b8b3a933ab Add django-debug-toolbar plugin 
- Must be running in DEBUG mode
- Must set debug_toolbar to True in config file
 2020-08-15 19:48:42 +10:00
Oliver Walters 2280558303 Add a method of return raw LaTeX for debugging 2020-08-15 19:27:31 +10:00