Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,520 Commits 6 Branches 99 Tags 484 MiB
efaa532162
Commit Graph

2520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
efaa532162 Merge remote-tracking branch 'inventree/master' 2020-04-05 22:07:57 +10:00
Oliver
3559e81d5f
Merge pull request #696 from SchrodingersGat/new-icons 
New icons
 2020-04-05 22:07:16 +10:00
Oliver Walters
7ecd843ca4 More translations 2020-04-05 20:56:16 +10:00
Oliver Walters
d1a27d2f7e Search icon rather than text 2020-04-05 20:51:07 +10:00
Oliver Walters
84b1960c7b Moar icons plz 2020-04-05 20:49:05 +10:00
Oliver Walters
7b494c08ec Translations 2020-04-05 20:40:46 +10:00
Oliver Walters
c170d3f87a More icons 2020-04-05 20:40:41 +10:00
Oliver Walters
bb844ab94b New icons for home page 2020-04-05 20:04:21 +10:00
Oliver Walters
c427f173ed Nav link icon improvements 2020-04-05 20:04:12 +10:00
Oliver Walters
ca98cbee68 More navbar icons 2020-04-05 20:04:04 +10:00
Oliver Walters
7dd749f394 Add icons to the navbar 2020-04-05 20:00:34 +10:00
Oliver Walters
b0c1999922 Include font-awesome scripts 2020-04-05 19:42:34 +10:00
Oliver Walters
cfd32db570 Include fontawesome icons 2020-04-05 19:34:48 +10:00
Oliver Walters
9112196b8f Add fontawesome files 2020-04-05 19:30:57 +10:00
Oliver
64a1f0f0a1
Merge pull request #695 from SchrodingersGat/api-fixes 
Api fixes
 2020-04-05 19:22:09 +10:00
Oliver Walters
d739c2dea8 "URL" is renamed to "link" in the URL 2020-04-05 19:18:32 +10:00
Oliver Walters
511cdef323 Peppy fix 2020-04-05 15:59:48 +10:00
Oliver Walters
91b5911ff2 Add 'notes' field to Part detail API 2020-04-05 15:46:18 +10:00
Oliver Walters
1f172b3a57 Add 'bom_items' and 'used_in' to Part detail API 2020-04-05 15:39:55 +10:00
Oliver Walters
b4d66c6797 Add 'building' count to Part detail API 2020-04-05 15:29:31 +10:00
Oliver Walters
428b52693a Merge remote-tracking branch 'inventree/master' 2020-04-05 01:00:00 +11:00
Oliver
7c09c20725
Update version.py 
Bump version number
 2020-04-05 00:56:16 +11:00
Oliver
cffb921fb1
Merge pull request #694 from SchrodingersGat/thumbnail-image 
Thumbnail image
 2020-04-05 00:55:32 +11:00
Oliver Walters
2d3e7e35af Fix middleware due to failing tests 2020-04-05 00:46:15 +11:00
Oliver Walters
8b61acb048 PEP fixes 2020-04-05 00:38:25 +11:00
Oliver Walters
0cfb293ca9 List API now uses the thumbnail image 2020-04-05 00:19:37 +11:00
Oliver Walters
afa31b3415 Generate thumbnails for any part images existing in the database 2020-04-05 00:19:05 +11:00
Oliver Walters
d505e79be8 Allow token-based access to /media/ and /static/ 
- The InvenTree app needs to access the images, but currently token auth only works for the /api/ endpoint
- The app cannot use csrf tokens!
- So, borrow the tokens which are already created per-user in the DRF framework
- If a user is not authed, then check for a token!
- See InvenTree/middleware.py for further documentation
 2020-04-04 23:29:05 +11:00
Oliver Walters
aee0970e49 Part image field now uses django-stdimage 2020-04-04 15:47:05 +11:00
Oliver Walters
55e831f4b4 Merge remote-tracking branch 'inventree/master' 2020-04-03 14:24:35 +11:00
Oliver
7ee94f3574
Merge pull request #692 from SchrodingersGat/api-improvements 
Api improvements
 2020-04-03 12:37:03 +11:00
Oliver Walters
b25df586cd Fix API tets 2020-04-03 12:30:58 +11:00
Oliver Walters
92f5648656 Fix API endpoints for Stock app 2020-04-03 12:20:43 +11:00
Oliver Walters
ccb637773f Add item count to StockLocation serializer 2020-04-03 11:41:51 +11:00
Oliver Walters
d4da6211be StockItem: filtering improvements 
- Optional 'cacade' param
- Filter by null parent
 2020-04-03 11:40:37 +11:00
Oliver Walters
fb94949538 Allow StockLocation filtering of null parent 2020-04-03 11:34:42 +11:00
Oliver Walters
f5150f549a Part API changes 
- Allow filtering parts with null parent (top-level category parts)
- Option to include sub-category parts or not
 2020-04-03 09:37:03 +11:00
Oliver Walters
6e65a736e7 Add isNull function to query against null keys 2020-04-03 09:31:26 +11:00
Oliver Walters
d17056820b Allow PartCategory filtering by null parent 2020-04-03 09:25:58 +11:00
Oliver Walters
7e8664a4dd Include "parts" count in Category API 2020-04-03 09:15:09 +11:00
Oliver Walters
aada5f91cb Merge remote-tracking branch 'inventree/master' 2020-03-31 22:15:58 +11:00
Oliver
40822a93df
Merge pull request #691 from SchrodingersGat/default-currency 
auto-fill price break with default quantity
 2020-03-31 22:14:10 +11:00
Oliver Walters
67a73c1fbf auto-fill price break with default quantity 2020-03-31 22:11:16 +11:00
Oliver
9d19029ba9
Merge pull request #690 from SchrodingersGat/bug-fixes 
Bug fixes
 2020-03-31 21:43:42 +11:00
Oliver Walters
c31b72bde2 type checking 2020-03-31 21:40:23 +11:00
Oliver Walters
6919eaa1e1 Update translations 2020-03-31 21:33:50 +11:00
Oliver Walters
124967ed31 Remove trailing zeros in part order form 2020-03-31 21:30:34 +11:00
Oliver Walters
570010b99c Change POLineItem quantity to a rounding decimal field 2020-03-31 21:23:57 +11:00
Oliver Walters
4c96b34c7c Override prepare_value method of RoundingDecimalFormField 
- Remove trailing zeros in form field display
 2020-03-31 21:21:39 +11:00
Oliver Walters
f07f3b99cf Remove 'notes' field from PurchaseOrder edit / create form 2020-03-31 20:48:44 +11:00