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,070 Commits 9 Branches 164 Tags
4cd54203a2630c2782302729e7d3092550312d63
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OliverandGitHub 1f5d81ef93 Merge pull request #900 from SchrodingersGat/stock-display-improvements 
Stock display improvements
 2020-08-09 21:26:26 +10:00
Oliver Walters cebba6909c Revert thing 2020-08-09 21:21:12 +10:00
Oliver Walters 3336eb9f45 Default stock list behaviour is to only show in_stock items 2020-08-09 21:12:49 +10:00
Oliver Walters 0da9e0f834 Add "sent_to_customer" filter 2020-08-09 21:10:21 +10:00
Oliver Walters 502702b3bc Add some more visual tags to the stock list 2020-08-09 21:04:41 +10:00
OliverandGitHub bb6b3b965d Merge pull request #896 from SchrodingersGat/company-ordering 
Add default ordering for Company model
 2020-08-08 17:21:21 +10:00
OliverandGitHub fcfd1f82d6 Merge pull request #898 from SchrodingersGat/filter-depleted 
Filter depleted
 2020-08-08 17:19:28 +10:00
Oliver Walters 19c036f50a Add migration files 2020-08-08 17:16:04 +10:00
Oliver Walters ad11681369 Custom filter tag for company stock listing 2020-08-08 17:15:08 +10:00
Oliver Walters bc3fda71a4 Display "depleted" label next to depleted stock 2020-08-08 17:11:50 +10:00
Oliver Walters 96a3f2920d Stock table filters now arranged in alphabetical order 2020-08-08 17:09:22 +10:00
Oliver Walters 099f56e779 Add "depleted" table filter 2020-08-08 17:08:18 +10:00
Oliver Walters 402301e165 Add ability to filter stock items by "depleted" status 2020-08-08 17:06:22 +10:00
OliverandGitHub 190610c6c9 Merge pull request #897 from SchrodingersGat/serialized-stock-adjust-fix 
Cannot edit quantity for serialized stock when adjusting
 2020-08-08 17:05:29 +10:00
Oliver Walters 732405f738 Cannot edit quantity for serialized stock when adjusting 2020-08-08 17:01:29 +10:00
Oliver Walters a7ee323035 PEP fix 2020-08-08 16:59:48 +10:00
Oliver Walters ad977d4d26 Add default ordering for Company model 
- Now will sort by "name" in choice fields, etc
 2020-08-08 16:54:09 +10:00
OliverandGitHub eac53c836c Update README.md 2020-08-08 09:52:14 +10:00
OliverandGitHub 2cd6c0b9fc Merge pull request #895 from SchrodingersGat/return-to-stock 
Return to stock
 2020-08-08 09:48:44 +10:00
Oliver Walters 8d9cfd3678 Migration file for StockStatus codes 2020-08-08 09:44:21 +10:00
Oliver Walters a2c3c1086c Catch unhandled javascript errors 2020-08-08 09:31:57 +10:00
Oliver Walters ff71fe6e93 Fix "in_stock" logic for StockItem 
- Not in stock if it is at a customer!
 2020-08-08 09:20:42 +10:00
Oliver Walters 861a2982db Removed "SHIPPED" stock status code 2020-08-08 09:16:53 +10:00
Oliver Walters 54c1f2d9a2 Upgrade to latest flake8 2020-08-08 09:15:45 +10:00
Oliver Walters 459cc03aae Remove "ASSIGNED_TO_BUILD" status code 2020-08-08 09:08:15 +10:00
Oliver Walters 80173a9d43 Remove ASSIGNED_TO_OTHER_ITEM status code 2020-08-08 09:07:25 +10:00
Oliver Walters bdea29df04 Add functionality to return stock item from customer 2020-08-08 09:05:33 +10:00
Oliver Walters 7b332d93ee Rearrange button layouts 2020-08-08 08:48:27 +10:00
OliverandGitHub 518ad3eb60 Merge pull request #892 from SchrodingersGat/import-fix 
Allow default_keywords to be  null
 2020-08-04 11:35:25 +10:00
Oliver Walters 0f199556df Add migration file 2020-08-04 11:21:27 +10:00
Oliver Walters 3a266cf322 Allow default_keywords to be null 2020-08-04 11:10:24 +10:00
OliverandGitHub 08bab0a1b9 Merge pull request #891 from SchrodingersGat/security-fix 
Update requirements.txt
 2020-08-03 19:53:34 +10:00
Oliver Walters 481eeb8338 Update requirements.txt 2020-08-03 19:36:41 +10:00
OliverandGitHub e0e82dabf3 Merge pull request #889 from SchrodingersGat/allow-empty-stock 
Allow creation of a stock item with zero quantity
 2020-07-30 21:09:57 +10:00
Oliver Walters 10691b3d03 Allow creation of a stock item with zero quantity 2020-07-30 21:05:37 +10:00
OliverandGitHub 8a1f358505 Merge pull request #888 from SchrodingersGat/allow-staff-delete 
Allow staff delete
 2020-07-30 20:29:57 +10:00
Oliver Walters b7f30ee136 Update translations 2020-07-30 20:26:14 +10:00
Oliver Walters d90edab59f Staff users are allowed to delete stock items that otherwise are not able to be deleted 2020-07-30 20:23:46 +10:00
OliverandGitHub daab81fa2c Merge pull request #887 from eeintech/allow_api_thumbnail_update 
Allowing Part thumbnail (image) update via API
 2020-07-22 09:19:43 +10:00
OliverandGitHub 5209a7a1b0 Merge pull request #884 from SchrodingersGat/fix-filters 
Adds table filters for stock assigned to a particular customer
 2020-07-14 16:05:44 +10:00
Oliver Walters 0152ae79ef Adds table filters for stock assigned to a particular customer 2020-07-14 15:54:03 +10:00
OliverandGitHub cfd1194a6e Merge pull request #883 from eeintech/api_delete_inactive_part 
API: Allow part deletion if inactive
 2020-07-09 19:42:51 +10:00
OliverandGitHub 3d7676e292 Merge pull request #880 from SchrodingersGat/negative-stock-fix 
Improve logic of "quantity_to_order" function
 2020-06-28 19:23:37 +10:00
OliverandGitHub 25b7f0b7ee Merge pull request #879 from SchrodingersGat/star-filter-fix 
Fix filter logic for 'starred' parts
 2020-06-28 19:14:55 +10:00
Oliver Walters 3d245c7ce3 Improve logic of "quantity_to_order" function 2020-06-28 19:14:51 +10:00
Oliver Walters 134a688e4a Fix filter logic for 'starred' parts 2020-06-28 19:08:13 +10:00
OliverandGitHub 8ac23c080f Merge pull request #875 from SchrodingersGat/tweaks 
"Active" part toggle is always enabled
 2020-06-22 11:33:39 +10:00
Oliver Walters fa3d2d005a "Active" part toggle is always enabled 2020-06-22 11:27:59 +10:00
OliverandGitHub da70af7ba0 Merge pull request #874 from SchrodingersGat/show_non_stock 
Add ability to display "out of stock" items against a part
 2020-06-22 10:55:12 +10:00
Oliver Walters 930f903f5d Add ability to display "out of stock" items against a part 2020-06-22 10:48:41 +10:00
OliverandGitHub 16bea33695 Merge pull request #867 from SchrodingersGat/name-conventions 
Update verbose names for some fields
 2020-06-13 20:52:15 +10:00
Oliver Walters dedc25d681 Update verbose names for some fields 2020-06-13 20:46:19 +10:00
OliverandGitHub 2047b2d7d7 Merge pull request #866 from SchrodingersGat/moar-buttons 
Reorganize buttons for "Part" view
 2020-06-12 18:16:06 +10:00
Oliver Walters 2e91f64a96 Add (disabled) print-label button for Part display 2020-06-12 18:13:14 +10:00
Oliver Walters 1ad4b8b131 Reorganize buttons for "Part" view 2020-06-12 18:11:57 +10:00
OliverandGitHub a63219466f Merge pull request #865 from SchrodingersGat/barcode-suppor 
Barcode support
 2020-06-12 17:57:36 +10:00
Oliver Walters 9757fb06db Fix a weird button issue 
- reloadTable() was causing the button 'click' handler to fire...
- NFI why this is happening
 2020-06-12 16:47:57 +10:00
Oliver Walters ab4e6548dc Transfer stock items into a stock location using barcode scanning 2020-06-12 16:29:08 +10:00
Oliver Walters 351a55c9ea Add the concept of "action groups" to the buttons for the Stock Location view 2020-06-12 11:14:33 +10:00