Commit Graph

2451 Commits

Author SHA1 Message Date
Oliver Walters
937211288e Merge remote-tracking branch 'inventree/master' 2020-05-02 17:30:08 +10:00
Oliver
0b2c6cfd70
Merge pull request #773 from SchrodingersGat/moar-speed-fix-plz
Reduce company list from 100 queries to 4 queries
2020-05-02 15:41:39 +10:00
Oliver Walters
6912899f41 Merge remote-tracking branch 'inventree/master' 2020-05-02 15:37:24 +10:00
Oliver Walters
b0f4475a83 Fixes 2020-05-02 15:36:48 +10:00
Oliver Walters
094ef38e27 Merge remote-tracking branch 'inventree/master' 2020-05-02 15:29:47 +10:00
Oliver Walters
a8e3a3f1ac Reduce company list from 100 queries to 4 queries 2020-05-02 15:23:28 +10:00
Oliver Walters
6aa6e3b924 Adjust icon size in nav bar 2020-05-02 15:03:49 +10:00
Oliver Walters
24a9a1127b Update favicon
https://www.favicon-generator.org/
2020-05-02 14:58:07 +10:00
Oliver Walters
a51aab6dd0 Update translations
(cherry picked from commit 032f3337cddf684839586728e47864d22a890024)
2020-05-02 14:55:31 +10:00
Oliver Walters
b44dbba150 New logo design
(cherry picked from commit b59e26b4629ea97e0ac8b3503cc50c59049d81c1)
2020-05-02 14:55:27 +10:00
Oliver Walters
9b2045025b StockItem page tweaks 2020-05-02 14:05:52 +10:00
Oliver Walters
cc11df917e Part list API adjustments 2020-05-02 14:03:17 +10:00
Oliver Walters
7fca496de8 Bug fix for StockItem list API
- The wrong detail data was being set
2020-05-02 13:51:29 +10:00
Oliver Walters
4197e29fce Major major major (improvements for StockItem list API)
OK LISTEN UP - Lots of work went into making this speedier:

- For related detail fields (e.g. part_detail), we pre-fetch and cache the model data
- This eliminates duplicate database hits for the same model instances
- Perform all field filtering manually, rather than using the DRF 'filter_fields' concept (this seems to add a lot of overhead)
- Use query annotations to getch calculated fields rather than fetching one-at-a-time
- And finally, if the request is AJAX then return a JsonResponse which is SO FREAKING MUCH FASTER
2020-05-02 13:46:19 +10:00
Oliver Walters
44319d24e4 Custom list serializer for 'location_detail' 2020-05-02 10:05:35 +10:00
Oliver Walters
a537b6df6e PEP fixes 2020-05-02 09:50:18 +10:00
Oliver Walters
4a60da67fd Significant increase in query speed for Part list
- Custom list method
- Cache PartCategory objects in memory
2020-05-02 09:49:05 +10:00
Oliver Walters
7fff0a7427 Catch an error if git cannot be found 2020-05-01 17:02:11 +10:00
Oliver Walters
af00d88555 Bug fix for custom migration
Ref: https://stackoverflow.com/questions/13410982/attributeerror-long-object-has-no-attribute-fetchall#13411358
2020-05-01 15:57:10 +10:00
Oliver Walters
a345e0e8da Removed unused serializer field 2020-04-28 23:26:27 +10:00
Oliver Walters
753fab2498 Fix url links in BOM table 2020-04-28 23:23:59 +10:00
Oliver Walters
3b42b5e27e Typo fix for part api 2020-04-28 23:17:59 +10:00
Oliver Walters
087001f29d Fix BOM table rendering
- Price was not being sent in the PartBriefSerializer!
2020-04-28 23:17:15 +10:00
Oliver Walters
df218a5193 Fix rendering of "used in" page 2020-04-28 22:57:18 +10:00
Oliver Walters
36ad69091b Merge remote-tracking branch 'inventree/master' 2020-04-28 12:34:47 +10:00
Oliver Walters
f84636fc20 DO NOT DRINK BLEACH 2020-04-28 12:29:28 +10:00
Oliver Walters
351e825ba8 Merge remote-tracking branch 'inventree/master' 2020-04-28 10:51:55 +10:00
Oliver Walters
ee906fc6e6 Unit test fixes 2020-04-28 10:46:02 +10:00
Oliver Walters
9add3d4409 Much better rendering and calculation of part allocations 2020-04-28 10:43:46 +10:00
Oliver Walters
fb70da0331 Cleanup part allocation calculation functions 2020-04-28 10:35:19 +10:00
Oliver Walters
6bdf371490 Moar UI and translation string fixes 2020-04-28 09:41:47 +10:00
Oliver Walters
bbecc8c900 Reverse URL bug fix 2020-04-28 09:35:24 +10:00
Oliver Walters
b913971008 Add more translatable strings 2020-04-28 09:32:33 +10:00
Oliver Walters
440fe155ff Change glyphicons for fontawesome
I think I gottem all
2020-04-28 09:31:51 +10:00
Oliver Walters
abbd0bb16a Bug fix in supplier-part table rendering 2020-04-28 09:05:06 +10:00
Oliver Walters
5727e27ae6 Filter by 'in stock' items when auto-allocating to build 2020-04-28 08:44:10 +10:00
Oliver Walters
4fd7b24e3c Update buttons for part BOM view 2020-04-28 08:36:13 +10:00
Oliver Walters
b338834146 Merge remote-tracking branch 'inventree/master' 2020-04-27 22:18:45 +10:00
Oliver Walters
394a9208a1 Merge remote-tracking branch 'inventree/master' into sales-order
# Conflicts:
#	InvenTree/InvenTree/version.py
2020-04-27 22:04:05 +10:00
Oliver Walters
79836c77ef Bumped version thing 2020-04-27 22:03:15 +10:00
Oliver Walters
db9970e5df Add some further unit tests for the Build model 2020-04-27 21:44:59 +10:00
Oliver Walters
cb3fe0fc35 Add some more unit testing for the builds 2020-04-27 21:28:44 +10:00
Oliver Walters
35f48ed899 Delete BuildItem objects once a Build has been completed
- Much more complicated template for build allocation page!
- This will require some refactoring at some point ...
2020-04-27 20:46:34 +10:00
Oliver Walters
489dfa1823 Bug fix for a code path which resulted in a form failing validation but not showing any errors!
This one has been here for a while!
2020-04-27 20:45:01 +10:00
Oliver Walters
2b99cf353a Fix for build complete form 2020-04-27 20:16:41 +10:00
Oliver Walters
646dd65d27 Re-enable auto-allocation for build 2020-04-27 20:05:02 +10:00
Oliver Walters
3685ca4b95 Add some unit testing for the SalesOrder model 2020-04-27 11:32:20 +10:00
Oliver Walters
5e309a62f7 Display "Fulfilled" items
- Once a salesorder has been marked as "shipped" then the table is displayed differently
- The sub rows show stock items which have been fulfilled against the sales order
2020-04-27 10:31:38 +10:00
Oliver Walters
5167117067 Calculate 'fulfilled' quantity once a sales order is marked as shipped
- This allows us to delete the SalesOrderAllocation objects from the database
2020-04-27 08:58:18 +10:00
Oliver Walters
3c5ba75d27 PEP fixes 2020-04-26 16:44:35 +10:00
Oliver Walters
e768ada83b More work
- Consolidated "in_stock" filter to single code location
- Improve 'limit_choices_to' for BuildItem and SalesOrderAllocation
- Various template improvements etc
2020-04-26 16:38:29 +10:00
Oliver Walters
4147163418 Improve status code label rendering 2020-04-26 15:29:21 +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
Oliver Walters
0892b160c6 "Fixes" for completing a build
- This will require a lot of unit testing to get right
2020-04-26 00:32:09 +10:00
Oliver Walters
72c43d0c2d Bug fix for build completion form 2020-04-25 23:59:28 +10:00
Oliver Walters
50dbebdf59 Improve rendering of BuildComplete template 2020-04-25 23:44:03 +10:00
Oliver Walters
81f789d857 Add link to parent build 2020-04-25 23:26:56 +10:00
Oliver Walters
4f0efec39f PEP and unit testing fixes 2020-04-25 23:24:00 +10:00
Oliver Walters
77361bd0a2 Update templates 2020-04-25 23:20:55 +10:00
Oliver Walters
01a68270ea Add verbose names for multiple Build model fields
- Improve methods for different models
2020-04-25 23:17:07 +10:00
Oliver Walters
181d1d6b91 Factor out function to calculate total allocations 2020-04-25 21:31:58 +10:00
Oliver Walters
912a3c4b99 Update progress bar based on sum of allocated quantities 2020-04-25 21:21:52 +10:00
Oliver Walters
b0891c921c Working towards better build allocation:
- Improve data serialization in API
- Javascript bug fixes
- Load the build allocation table using jQuery
2020-04-25 21:13:38 +10:00
Oliver Walters
c11b433d94 Make Build object into a MPTT tree model
- Builds can have child builds
2020-04-25 15:25:17 +10:00
Oliver Walters
2f0bbecc3d Refactored status code label generation
- Larger style available
2020-04-25 15:13:55 +10:00
Oliver Walters
4e40d92db7 PEP fix 2020-04-25 13:31:42 +10:00
Oliver Walters
66b6036827 Add two new "build orders" tab to the "sales order" view 2020-04-25 13:29:18 +10:00
Oliver Walters
d5f3498238 Add a "sales_order" reference to the Build model
- If a build order is made to fulfil a sales order
- Add sales_order filtering to the Build API
- Pass initial information through to the BuildCreate view
2020-04-25 13:15:45 +10:00
Oliver Walters
b351976ae9 Mark a SalesOrder as "shipped"
- Option to hide non-stock items from stock list
- Update models with new feature
2020-04-25 08:46:28 +10:00
Oliver Walters
41a4033427 Selective display of sales order ilne buttons 2020-04-24 17:18:18 +10:00
Oliver Walters
429bb688d0 Template fixes 2020-04-24 13:03:38 +10:00
Oliver Walters
9d25ed335c Rebuild the "PurchaseOrder" detail
- Use AJAX and bootstrap-table
- Display progress bar
2020-04-24 12:52:08 +10:00
Oliver Walters
ba1d2063af Remove some debug messages and fix PIP 2020-04-24 10:22:33 +10:00
Oliver Walters
77471cb89c Form for shipping a SalesOrder
- Returns "False" for now
2020-04-24 10:20:56 +10:00
Oliver Walters
b45fec221c Expose more status code data to the templates
- Status codes are now exposed globally to every page
- Much simplified so wow
- https://stackoverflow.com/questions/3221592/how-to-pass-common-dictionary-data-to-every-page-in-django
2020-04-24 09:27:42 +10:00
Oliver Walters
2c9b112562 PEP fixes 2020-04-23 21:48:39 +10:00
Oliver Walters
e5fa94b4f8 Add functionality to cancel a sales order 2020-04-23 21:38:40 +10:00
Oliver Walters
e384f9e94c Order date adjustment
Sales order now has a "shipment date"
2020-04-23 20:42:59 +10:00
Oliver Walters
435c13cf7c Separate concept of "OrderStatus" into "SalesOrderStatus" and "PurchaseOrderStatus" 2020-04-23 20:38:09 +10:00
Oliver Walters
7f020cbbf6 Enbiggen a whole lotta buttons 2020-04-23 19:41:14 +10:00
Oliver Walters
426aa9258c URL cleanup 2020-04-23 17:37:53 +10:00
Oliver Walters
5d71cf85cc Add separate 'quantity' and 'allocated' columns in sales order view 2020-04-23 16:00:09 +10:00
Oliver Walters
c9ea33e22e Fix order of javascript table events 2020-04-23 10:58:26 +10:00
Oliver Walters
d59c6711bb Update translations 2020-04-23 09:20:25 +10:00
Oliver Walters
1a0f091e0c Improve progress bar rendering 2020-04-23 09:20:18 +10:00
Oliver Walters
a803f21e0c Add buttons to create new builds or orders for sales order parts
- Need to pre-fill the forms a bit better
2020-04-22 23:34:27 +10:00
Oliver Walters
6112be2df0 Add forms for editing and deleting a SalesOrderAllocation item 2020-04-22 23:21:54 +10:00
Oliver Walters
2a4e903785 Add button to delete a SalesOrderLineItem 2020-04-22 22:36:55 +10:00
Oliver Walters
26d1a25f31 PEP style fixes 2020-04-22 22:24:06 +10:00
Oliver Walters
fd42149f67 More stuff 2020-04-22 22:22:22 +10:00
Oliver Walters
6ab03bd05a Add form for creating a new StockItem allocation 2020-04-22 21:26:38 +10:00
Oliver Walters
2972aec759 Cleverer rendering of sales order allocations 2020-04-22 20:26:05 +10:00
Oliver Walters
b70e79b778 Optionally add all SalesOrderAllocations to the SalesOrderLineItem serializer 2020-04-22 20:10:23 +10:00
Oliver Walters
5d1754ec32 Better display of where a StockItem is allocated 2020-04-22 17:39:59 +10:00
Oliver Walters
eb7b49784b StockItem serializer now includes the allocated quantity 2020-04-22 15:24:11 +10:00
Oliver Walters
d9698b10cc PEP fixes 2020-04-22 13:21:45 +10:00
Oliver Walters
1373425c29 Update definition for StockItemAllocation model
- Limit foreignkey choices
- Error checking
- Check if a StockItem is over-allocated
- Fix API serialization and filtering
2020-04-22 13:11:19 +10:00
Oliver Walters
2cb1b076f6 Create "SalesOrderAllocation" object
- Links multiple StockItem objects to a single SalesOrderLineItem
2020-04-22 12:12:48 +10:00
Oliver Walters
3a71a4f63a Fix for StockItem model
- Allow sales_order_line to be blank
2020-04-22 10:16:54 +10:00
Oliver Walters
6dd79af0b6 Expose "is_allocated" parameter on StockItem API 2020-04-22 10:11:40 +10:00
Oliver Walters
12daf15406 Update build page 2020-04-22 09:53:11 +10:00
Oliver Walters
372958d939 Migrate more pages to the two_column template 2020-04-22 09:50:10 +10:00
Oliver Walters
808a636484 Move "Company" view to new two-column template 2020-04-22 09:01:52 +10:00
Oliver Walters
79ea744280 Supplier part rendering fix 2020-04-21 22:39:47 +10:00
Oliver Walters
09ccd6c5e2 PEP style fixes 2020-04-21 22:37:35 +10:00
Oliver Walters
b75c343236 Add action buttons to the sales order page 2020-04-21 22:02:17 +10:00
Oliver Walters
15166c7797 Add a custom "id" to the progress bar 2020-04-21 21:43:04 +10:00
Oliver Walters
4979c690d9 Prevent BOM price calculation from becoming too recursive 2020-04-21 21:38:22 +10:00
Oliver Walters
cb636e000d Display a sub-list of stock items which are allocated to a SalseOrderLineItem 2020-04-21 21:38:04 +10:00
Oliver Walters
b40234e403 UI tweaks 2020-04-21 20:05:15 +10:00
Oliver Walters
399dcafede Use the existing bootstrap CSS for progress bars 2020-04-21 18:14:02 +10:00
Oliver Walters
2c6e8da90e Ability to filter StockItemList API by sales_order or sales_order_line 2020-04-21 17:33:02 +10:00
Oliver Walters
0d1919f10b Display an alert on a stock item page if that stock item is allocated to a salesorder 2020-04-21 16:59:14 +10:00
Oliver Walters
89ede3e103 Fix for SalesOrderLineItem allocation calculation
Also function to render a progress bar
2020-04-21 16:45:44 +10:00
Oliver Walters
a1376eeb9e The 'StockItem' model now has a reference to a SalesOrderLineItem 2020-04-21 15:04:21 +10:00
Oliver Walters
8052a1989c Serialize the allocated quantity for a purchase-order line item 2020-04-21 11:41:08 +10:00
Oliver Walters
7385099194 Add a model to map multiple StockItem objects to a single SalesOrderLineItem 2020-04-21 10:14:55 +10:00
Oliver Walters
19cd0707a2 Add / edit / delete attachments for SalesOrder 2020-04-21 09:42:11 +10:00
Oliver Walters
a06595c152 Add line numbering to SalesOrderLineItem table 2020-04-21 09:20:44 +10:00
Oliver Walters
22c96ad2b7 Add ability to filter SalesOrder list by part 2020-04-21 09:17:50 +10:00
Oliver Walters
3d2e907d5e Add a 'sales order' view for each part 2020-04-21 09:15:01 +10:00
Oliver Walters
b204618e79 Button / view / form to create a new SalesOrderLineItem 2020-04-21 09:02:10 +10:00
Oliver Walters
617fbf2f02 Moar stuffs:
- Expose part_detail and order_detail to SOLineItem serializer
- Update SalesOrder line item table
2020-04-21 08:57:13 +10:00
Oliver Walters
a2c0c7c76a Add "part" reference to SalesOrderLineItem model 2020-04-21 08:33:32 +10:00
Oliver Walters
34d3dca8b7 Add ability to filter parts by "purchasable" status 2020-04-20 22:40:52 +10:00
Oliver Walters
9e4d09343c Add ability to filter parts list by "salable" status 2020-04-20 22:39:00 +10:00
Oliver Walters
0c56079b41 Create missing tabs for sales orders
- Attachments
- Notes
2020-04-20 22:33:49 +10:00
Oliver Walters
e12824df2e Add form to edit a SalesOrder 2020-04-20 22:20:03 +10:00
Oliver Walters
ce1dd88129 Form for creating a new SalesOrder 2020-04-20 22:13:07 +10:00
Oliver Walters
ebbcff3c7f Render a table of line items 2020-04-20 21:22:34 +10:00
Oliver Walters
b2569d5cba Expose SalesOrderLineItem objects to the REST API 2020-04-20 21:11:59 +10:00
Oliver Walters
47ada25315 Add detail view for SalesOrder 2020-04-20 20:59:14 +10:00
Oliver Walters
1ebf26ab7c Add page for displaying all sales orders 2020-04-20 20:40:45 +10:00
Oliver Walters
627c50e465 Render a table of sales orders 2020-04-20 20:27:52 +10:00
Oliver Walters
c7fd22924f Register salesorder classes in the admin interface 2020-04-20 20:27:35 +10:00
Oliver Walters
9f97d81e83 API endpoint for serializing SalesOrder objects 2020-04-20 20:11:21 +10:00
Oliver Walters
5901b21e78 UI elements
- Add a "sales order" menu item to the main navbar
- Add a "sales order" tab to customer detail page
2020-04-20 19:47:29 +10:00
Oliver Walters
974c98c95a Add "SalesOrder" concept
- SalesOrder model
- SalesOrderLineItem
- SalesOrderAttachment
2020-04-20 19:41:58 +10:00
Oliver
c5166ec845
Update version.py 2020-04-20 19:30:58 +10:00
Oliver
13c7e2af49
Update version.py
Modify version number for release
2020-04-20 19:28:09 +10:00
Oliver Walters
87d8b4674a Merge remote-tracking branch 'inventree/master' 2020-04-20 09:58:49 +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
Oliver Walters
c49cd9ffde Merge remote-tracking branch 'inventree/master' 2020-04-20 01:28:31 +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
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
Oliver Walters
51e2f5c46b Merge remote-tracking branch 'inventree/master' 2020-04-18 15:46:33 +10:00
Oliver Walters
880655c141 Small fix for config template 2020-04-18 13:22:52 +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
Oliver Walters
4822d3fd63 Merge remote-tracking branch 'inventree/master' 2020-04-17 21:49:00 +10:00
Oliver Walters
37fcb810e4 Add error checking for thumbnail file migration 2020-04-17 19:23:43 +10:00
Oliver Walters
cbfb3b55e6 Merge remote-tracking branch 'upstream/master' 2020-04-17 19:14:15 +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
Oliver Walters
762d735618 Merge remote-tracking branch 'inventree/master' 2020-04-16 21:55:59 +10:00
Oliver
cf5af4dc77
Merge pull request #722 from SchrodingersGat/barcode
Create simple endpoint for barcode decode
2020-04-16 21:55:24 +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
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
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
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
Oliver Walters
3b08b962c1 Fix order of operations 2020-04-13 23:19:23 +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
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
Oliver Walters
2e1c4e9792 Merge remote-tracking branch 'inventree/master' 2020-04-13 20:43:00 +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
Oliver Walters
04097791bb Custom migration for walking user through the process of mapping supplierpart to manufacturer
(cherry picked from commit 290002fe9d)
2020-04-13 20:20:13 +10:00
Oliver Walters
2695368651 Add migration to create a 'manufacturer' field to the SupplierPart model
(cherry picked from commit 890e938662)
2020-04-13 20:20:08 +10:00
Oliver Walters
00315aa855 Add 'manufacturer' field to SupplierPart object
- ForeignKey link to Company model

(cherry picked from commit acebe61ac5)
2020-04-13 20:20:04 +10:00
Oliver Walters
8b366fc4a0 Rename "manufacturer" to "manufacturer_name"
(cherry picked from commit e9e734acce)
2020-04-13 20:19:59 +10:00
Oliver Walters
2a4e8cd062 Improve company search results page
(cherry picked from commit 34abf34c0f)
2020-04-13 20:19:53 +10:00
Oliver Walters
d05ba9ee1a Customize "CompanyCreate" form based on calling url
(cherry picked from commit 8adc83b650)
2020-04-13 20:19:48 +10:00
Oliver Walters
67d9d2bb04 Separate views for customer / supplier / manufacturer
(cherry picked from commit 9e9e29679d)
2020-04-13 20:19:21 +10:00
Oliver Walters
edfb19db13 Company table now in separate javascript file
(cherry picked from commit 95354f09da)
2020-04-13 20:19:16 +10:00
Oliver Walters
094a0fe709 Improvements to company API
- Filter by is_manufacturer
- Better table display

(cherry picked from commit f427ee4754)
2020-04-13 20:19:10 +10:00
Oliver Walters
906ed7f64d Add "is_manufacturer" field to company model
(cherry picked from commit fd45db9e22)
2020-04-13 20:19:03 +10:00
Oliver Walters
a8ceddc8e4 Merge remote-tracking branch 'inventree/master' 2020-04-12 01:05:42 +10:00
Oliver Walters
5e2ed06c2d Add some more translations 2020-04-12 01:00:49 +10:00
Oliver Walters
3c46e12839 Further work on decimal rounding
- Prevent numbers from being represented in scientific notation
2020-04-12 00:56:15 +10:00
Oliver Walters
04cee99791 Update for supplier part list table rendering 2020-04-12 00:46:29 +10:00
Oliver Walters
f1f27f08cb Add icons to part base 2020-04-12 00:40:48 +10:00
Oliver Walters
f248b20ba4 Fix 2020-04-12 00:33:43 +10:00
Oliver Walters
6ed482d9eb Update translations 2020-04-12 00:33:10 +10:00
Oliver Walters
fd8273e3e2 Improve build base rendering
- Consolidate style
- Fix rendering of part pricing
2020-04-12 00:31:59 +10:00
Oliver Walters
a65c80dbf3 Small fixes here and there 2020-04-12 00:20:29 +10:00
Oliver Walters
7503596ea4 More fixes
- Add a set of template tags for rendering status codes
- Improve build API filtering
- Remove some outdated files
- Fix unit testing
2020-04-12 00:10:33 +10:00
Oliver Walters
59778130cd Revert display of "INACTIVE" parts 2020-04-11 23:09:21 +10:00
Oliver Walters
de6f2d37e5 Coalesce baby, yeah! 2020-04-11 23:05:07 +10:00
Oliver Walters
2560613e36 Update API docstring 2020-04-11 23:03:03 +10:00
Oliver Walters
f5a8b110b5 Filter part table by 'is_component' status 2020-04-11 23:02:18 +10:00
Oliver Walters
0f90e8f522 Filter parts by 'is_assembly'
Also greatly improve rendering of the Part table
2020-04-11 22:57:40 +10:00
Oliver Walters
e1c6ad7761 Logic fix for part filtering 2020-04-11 22:57:16 +10:00
Oliver Walters
e86bc4fa6d Add ability to filter parts by "low_stock"
- Huzzah for the "Coalesce" function, eh?
2020-04-11 22:43:51 +10:00
Oliver Walters
f06078f4ac CSS tweaks
- Still doesn't look exactly right
2020-04-11 22:25:34 +10:00
Oliver Walters
5e706554b1 Part table filtering
- Filter by active status
- Filter by 'is_template' status
- Filter by 'has_stock'
- Allow cascading sublocations
- API improvements to allow new features
2020-04-11 22:10:15 +10:00