inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
2,533 Commits 9 Branches 164 Tags
48c51151c85b21216957ee91c67c1ef8c2aaf55a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
OliverandGitHub 48c51151c8 Merge pull request #756 from SchrodingersGat/moar-migration-fixes-plz 
Remove the problematic migration entirely
 2020-04-26 09:00:23 +10:00
Oliver Walters ae4717401f Add "sudo" to makefile 2020-04-26 08:56:36 +10:00
Oliver Walters 1f4bd95d75 Remove the problematic migration entirely 
- The thumbnail check code is run every time the server is started anyway!
 2020-04-26 08:50:37 +10:00
OliverandGitHub c5166ec845 Update version.py 2020-04-20 19:30:58 +10:00
OliverandGitHub 13c7e2af49 Update version.py 
Modify version number for release
 2020-04-20 19:28:09 +10:00
OliverandGitHub 85e20041c7 Merge pull request #739 from SchrodingersGat/api-consolidation 
Api consolidation
 2020-04-20 09:55:16 +10:00
Oliver Walters ff3cc96e0e PEP fixes 2020-04-20 09:50:41 +10:00
Oliver Walters 746e9ab983 Fix rendering of PurchaseOrder table 2020-04-20 09:48:33 +10:00
Oliver Walters 99fcbcc646 Consolidation of PurchaseOrder API 2020-04-20 09:41:21 +10:00
Oliver Walters fee6246a8f PEP fix 2020-04-20 08:25:24 +10:00
Oliver Walters 4ec5e9a907 Consolidate StockItem serializer 2020-04-20 08:24:43 +10:00
Oliver Walters ef66a3b8f3 Make PartDetail view same as PartList view 2020-04-20 08:10:59 +10:00
OliverandGitHub 654f5d348e Merge pull request #738 from SchrodingersGat/stock-count-fix 
Stock count fix
 2020-04-20 01:26:42 +10:00
Oliver Walters f5c86bc457 "Fix" for unit tests 
- Not working in travis for some reason?
- But they are working locally...
 2020-04-20 01:23:05 +10:00
Oliver Walters 57fa69f6e6 Update version 
- Display django version in "about" dialog
 2020-04-20 01:20:09 +10:00
Oliver Walters c72fce0cc5 Add "tracking items" back in 2020-04-20 01:14:19 +10:00
Oliver Walters b2c40c91b7 PEP fixes 2020-04-20 01:11:25 +10:00
Oliver Walters 0334035e77 Simplify StockItem serializer 
- Some more work needed here to cut down on database hits
 2020-04-20 01:09:37 +10:00
Oliver Walters 4b1b9df193 Update stock table rendering 2020-04-20 01:02:19 +10:00
Oliver Walters 6a89e0089d Updates for stock serializer 2020-04-20 00:49:13 +10:00
Oliver Walters 5233281a24 Should have checked first :'( 
New tablib is broked (at least in the admin interface)
 2020-04-20 00:19:04 +10:00
Oliver Walters 468eba1759 Update PIP requirements 
- django-mptt required updating to fix a bug where tree was not being rebuild on item save
 2020-04-20 00:16:57 +10:00
Oliver Walters ff91c4ec53 Add a new verision of django-qr-code 
Official package does not (yet) support django 3.0
 2020-04-20 00:10:16 +10:00
Oliver Walters 3a64d0bc8f Fix display of part table 2020-04-20 00:00:14 +10:00
Oliver Walters 092215918c PEP fixes 2020-04-19 23:56:16 +10:00
Oliver Walters 2621c51a7e Further API cleanup 
- Perform a single call to get starred parts for current user and record results
- This provides significant speed improvements
- Remove old manual serializer
- More data prefetching
 2020-04-19 23:50:41 +10:00
Oliver Walters 69b8eed028 Fixes for aggregation issues 
- Ensure that "distinct=True" is set!
- ARRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
 2020-04-19 22:54:46 +10:00
Oliver Walters 85d1c585c0 Update to django3! 
- This is required to fix some issues with query aggregations as "distinct=True" cannot be set for Sum operations until django 3.0
- Multiple annotations on the same queryset were returning invalid results
- Ref: https://code.djangoproject.com/ticket/10060
- Ref: https://docs.djangoproject.com/en/3.0/topics/db/aggregation/#combining-multiple-aggregations
- django-dbbackup required updating for django3 support
- django-qr-code for now is disabled, a new solution needs to be worked out
 2020-04-19 22:44:16 +10:00
OliverandGitHub 9cb1af9587 Merge pull request #737 from SchrodingersGat/doc-updates 
Remove some docs pages
 2020-04-18 14:55:04 +10:00
Oliver Walters b580df0d30 Update README.md to point to the new docs 2020-04-18 14:37:51 +10:00
Oliver Walters d953f1a31e Remove some docs pages 
- These are now being consolidated on the inventree.github.io page
 2020-04-18 14:09:14 +10:00
OliverandGitHub a28b7df9d4 Merge pull request #736 from SchrodingersGat/config-file-fix 
Small fix for config template
 2020-04-18 13:26:43 +10:00
Oliver Walters 880655c141 Small fix for config template 2020-04-18 13:22:52 +10:00
OliverandGitHub 4f3f78f55a Merge pull request #735 from SchrodingersGat/token-auth-fix 
Improvements for token authentication
 2020-04-18 12:12:54 +10:00
Oliver Walters 6e3f603413 Improvements for token authentication 
- Do not POST username and password data
- This is already encoded in the Authorization: Basic headers
 2020-04-18 12:06:50 +10:00
OliverandGitHub 2b70b947ee Merge pull request #734 from SchrodingersGat/migration-fix 
Add error checking for thumbnail file migration
 2020-04-17 21:46:36 +10:00
Oliver Walters 37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
OliverandGitHub d6d891c16f Merge pull request #733 from SchrodingersGat/travis-fix 
Delete unused import
 2020-04-17 08:43:57 +10:00
Oliver Walters 75fed2ebdd Unit testing for barcode API endpoint 2020-04-17 08:40:59 +10:00
Oliver Walters 91012d2788 Delete unused import 2020-04-17 08:40:37 +10:00
OliverandGitHub cf5af4dc77 Merge pull request #722 from SchrodingersGat/barcode 
Create simple endpoint for barcode decode
 2020-04-16 21:55:24 +10:00
OliverandGitHub 4a99996be8 Merge pull request #732 from SchrodingersGat/search-fix 
Search fix
 2020-04-16 21:47:46 +10:00
Oliver Walters 0ee53758b4 Add same optio for stock table 2020-04-16 21:43:21 +10:00
Oliver Walters 206d67337f Option to disable filters for part table 2020-04-16 21:41:45 +10:00
Oliver Walters 7ab58f683f Fix search result tables 2020-04-16 21:33:35 +10:00
OliverandGitHub 539b000460 Update start.rst 
typo fix
 2020-04-16 21:02:14 +10:00
OliverandGitHub a66334abf2 Merge pull request #729 from SchrodingersGat/doc-fix 
Update requirements documentation
 2020-04-16 10:11:45 +10:00
Oliver Walters 4594f1e2b8 Update requirements documentation 
- Add python3-dev and g++
- Add wheel to PIP requirements file
 2020-04-16 09:56:32 +10:00
Oliver Walters 10ee8bc666 Use existing serializers to encode information for barcode response 2020-04-15 23:41:16 +10:00
Oliver Walters d19e287cb5 Template rendering improvements 2020-04-15 14:24:59 +10:00
Oliver Walters 610f85597f Expose supplier_reference to external API 2020-04-15 14:18:17 +10:00
Oliver Walters c12a482e4d Add "supplier_reference" field to PurchaseOrder 
- This is the code that the Supplier uses for the particuarl sales order
 2020-04-15 13:32:14 +10:00
Oliver Walters 44addc9d7f Bugfix 2020-04-15 07:54:38 +10:00
Oliver Walters d57fed6142 Change fingerprint icon to barcode 2020-04-15 00:30:00 +10:00
Oliver Walters a58e2e84f8 Add "ActionPlugin" interface 
- Plugin for running a custom action
 2020-04-15 00:16:42 +10:00
Oliver Walters 4d7407ee51 Logic fix 2020-04-14 23:38:42 +10:00
Oliver Walters 7faa0d199d Push even more barcode decoding to the individual plugin 
- DigiKey barcode is NOT json formatted, for example...
 2020-04-14 23:33:03 +10:00
Oliver Walters e56c018a4a Display StockItem UID if one exists 2020-04-14 23:28:46 +10:00
Oliver Walters bad56f64e3 Server does more of the heavy-lifting of the barcode decoding 2020-04-14 23:22:57 +10:00
Oliver Walters 977316cb3a Include UID field in StockItem API 2020-04-14 22:57:46 +10:00
Oliver Walters ba4a1fd771 Add a 'uid' field to StockItem model 
- To be used for barcode asociation and lookup
 2020-04-14 22:54:05 +10:00
Oliver Walters 277b28a7e9 Create a "unique(ish)" hash for barcode data 2020-04-14 22:38:32 +10:00
Oliver Walters f742f32804 Added some doc string 2020-04-14 22:33:03 +10:00
Oliver Walters 94e400d0e1 Simplify barcode plugin class 2020-04-14 22:30:29 +10:00
Oliver Walters 5de85defa7 Validation of InvenTree style barcodes 2020-04-14 22:00:58 +10:00
Oliver Walters 4a615e05ae Further barcode work 
- Simplify InvenTree barcode format
- Create base-clas for plugin
 2020-04-14 21:30:43 +10:00
Oliver Walters 70589b06e1 doc 2020-04-14 19:27:43 +10:00
OliverandGitHub 9dd8d09158 Merge pull request #726 from SchrodingersGat/link-fix 
URL fix
 2020-04-14 08:35:54 +10:00
Oliver Walters 7c9eb90bea URL fix 2020-04-14 08:25:10 +10:00
Oliver Walters cb1298847e Load barcode plugins and throw test data at them 2020-04-14 01:18:57 +10:00
Oliver Walters 38fab9c681 Test API info endpoint 2020-04-14 01:18:30 +10:00
Oliver Walters b286a5e30c Plugin framework 
- Registers some very simple barcode plugins
 2020-04-14 01:17:44 +10:00
OliverandGitHub 6725709456 Merge pull request #721 from SchrodingersGat/reverse-migration 
Fix the manufacturer migration so it reverses properly
 2020-04-14 00:01:40 +10:00
Oliver Walters 653d502a73 Fix the manufacturer migration so it reverses properly 2020-04-13 23:58:10 +10:00
Oliver Walters 9ff5032020 Create simple endpoint for barcode decode 2020-04-13 23:39:56 +10:00
OliverandGitHub 6c761c2d0f Merge pull request #720 from SchrodingersGat/migration-fix 
Fix order of operations
 2020-04-13 23:21:56 +10:00
Oliver Walters 3b08b962c1 Fix order of operations 2020-04-13 23:19:23 +10:00
OliverandGitHub 44a820e74f Merge pull request #719 from SchrodingersGat/migration-fix 
Fix buggy migration
 2020-04-13 22:57:16 +10:00
Oliver Walters fb8c0e5180 Fix buggy migration 
- Need to use raw SQL queries as the database model does not match the python model
 2020-04-13 22:53:14 +10:00
OliverandGitHub 2cbf7d578b Merge pull request #718 from SchrodingersGat/starred-filter 
Starred filter
 2020-04-13 22:41:35 +10:00
Oliver Walters 47530b7d2a Improvements for "SupplierPartCreate" form 2020-04-13 22:21:20 +10:00
Oliver Walters 0e55911a6b Index page rendering is now a lot faster 
- Hide some elements which are currently very expensive to compute
-
 2020-04-13 22:07:14 +10:00
Oliver Walters 90ac3a5a8a Add custom user filter for 'starred' status 2020-04-13 21:30:34 +10:00
Oliver Walters 124fab3eee Display a part as 'starred' in the part table 2020-04-13 21:30:17 +10:00
Oliver Walters b850beb687 Add ability to filter by 'starred' status 2020-04-13 21:24:36 +10:00
OliverandGitHub c76c93237e Merge pull request #716 from SchrodingersGat/manufacturer-link 
Manufacturer link
 2020-04-13 20:40:51 +10:00
Oliver Walters 80fa40694c Unit testing fixes 
- For some reason the builds were passing locally?
 2020-04-13 20:36:51 +10:00
Oliver Walters 9c7813992d Remove old 'manufacturer_name' field 2020-04-13 20:26:24 +10:00
Oliver Walters c17c014b33 More cleanup 
- Allow user filtering for purchase-order table in part view
- Remove some debug strings

(cherry picked from commit ea466c3588)
 2020-04-13 20:21:13 +10:00
Oliver Walters 307dd25f87 Fixes for unit testing 
(cherry picked from commit eb3b5308ab)
 2020-04-13 20:21:08 +10:00
Oliver Walters 8fa3d77416 Short-circuit the custom migration if there are no SupplierPart objects 
- This allows the unit testing to run!

(cherry picked from commit f243b567fd)
 2020-04-13 20:21:04 +10:00
Oliver Walters 8c55831321 Fix supplier-part-table for Part view 
(cherry picked from commit 2839f94773)
 2020-04-13 20:21:00 +10:00
Oliver Walters 7c892263f8 More API fixes 
- Allow searching supplier parts by manufacturer name
- Better rendering of supplier part table

(cherry picked from commit 62199aedf5)
 2020-04-13 20:20:55 +10:00
Oliver Walters f88d03db88 Fix "supplier parts" tab for Company display 
Also PEP fixes

(cherry picked from commit a50ecb24c1)
 2020-04-13 20:20:51 +10:00
Oliver Walters bced189c64 Cleanup display of "SupplierPart" page 
(cherry picked from commit f067eae7d2)
 2020-04-13 20:20:43 +10:00
Oliver Walters 14d18e9d95 "Part" column in Stock table links to supplier part 
(cherry picked from commit 5f0080cc54)
 2020-04-13 20:20:38 +10:00
Oliver Walters 2506aa110b API changes 
- Allow SupplierPart to be filtered by 'company' in addition to 'supplier' and 'manufacturer'
- Stock can now also be filtered by 'company'

(cherry picked from commit 1b1cd944be)
 2020-04-13 20:20:33 +10:00
Oliver Walters 696c101628 Change related name for SuppleirPart.supplier 
(cherry picked from commit 635c4339e0)
 2020-04-13 20:20:28 +10:00
Oliver Walters 0001b889f0 Update company API 
- option to include manufacturer_detail
- improve company serializer

(cherry picked from commit 2ea1e72c44)
 2020-04-13 20:20:23 +10:00
Oliver Walters 4e3825682a Doc fix for mgiration 
(cherry picked from commit 6ef32dfa2d)
 2020-04-13 20:20:18 +10:00