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,106 Commits 9 Branches 164 Tags
c31b30bf83c27bb4c2ac212bfff00fac4c30b833
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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