inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-26 19:07:40 +00:00
Code Activity
4,136 Commits 7 Branches 132 Tags
5666db6b7ad48be3323eff74cf0f5abc112f051c
Commit Graph

4136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
0.0.12 		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
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
Oliver Walters
c49cd9ffde Merge remote-tracking branch 'inventree/master' 2020-04-20 01:28:31 +10:00
Oliver
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
Oliver Walters
51e2f5c46b Merge remote-tracking branch 'inventree/master' 2020-04-18 15:46:33 +10:00
Oliver
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
Oliver
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
Oliver
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
Oliver Walters
4822d3fd63 Merge remote-tracking branch 'inventree/master' 2020-04-17 21:49:00 +10:00
Oliver
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
Oliver Walters
cbfb3b55e6 Merge remote-tracking branch 'upstream/master' 2020-04-17 19:14:15 +10:00
Oliver
d6d891c16f Merge pull request #733 from SchrodingersGat/travis-fix 
Delete unused import
v0.0.11 		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
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
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