inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-19 04:50:47 +00:00
Code Activity
2,358 Commits 9 Branches 164 Tags
ae9ef040130dc5aa7ba62cf9b8584e0e2c28f840
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters ae9ef04013 Use the company thumbnail in the Company API 2020-04-07 11:27:56 +10:00
Oliver Walters e0655f61d8 Check if Company thumbnails are created on Company app start 2020-04-07 11:23:30 +10:00
Oliver Walters 1a233e7949 Create thumbnails for Company model 2020-04-07 11:17:00 +10:00
Oliver Walters 16d3a87e78 Delete old code 2020-04-07 08:12:10 +10:00
Oliver Walters 7fb89e4dbe Check for missing part thumbnails when the server first runs 2020-04-07 08:08:54 +10:00
Oliver Walters 97f605ef55 Remove some weird trailing zeros 2020-04-07 00:19:51 +10:00
Oliver Walters 1356718bb7 Improver company website icon 2020-04-07 00:19:43 +10:00
OliverandGitHub b319041dfa Merge pull request #701 from SchrodingersGat/and-yet-more-improvements 
And yet more improvements
 2020-04-06 22:50:33 +10:00
Oliver Walters b8bbd15c88 Icon cleanup 2020-04-06 22:02:27 +10:00
Oliver Walters 96547b885e Include supplier-part information in Stock API 2020-04-06 22:02:23 +10:00
OliverandGitHub 5956b8cdee Merge pull request #700 from SchrodingersGat/instance-name 
Instance name
 2020-04-06 21:09:08 +10:00
Oliver Walters 3eb585df27 fixes for unit testing 2020-04-06 21:01:24 +10:00
Oliver Walters 0840cebd57 Rearrange purchase order table 2020-04-06 20:56:07 +10:00
Oliver Walters 44c10c45cd visual consolidation 2020-04-06 20:50:33 +10:00
Oliver Walters e6f6a936e0 Can haz moar icons? 2020-04-06 20:24:45 +10:00
Oliver Walters 751937e0c2 Use InstanceName around the place 
- Report in /api/ endpoint
- Display in About window
- Include in any generated barcode
 2020-04-06 20:11:36 +10:00
Oliver Walters 071c317bae Add 'InstanceName' setting 
- Will be auto-generated if it does not already exist
 2020-04-06 19:28:08 +10:00
OliverandGitHub 7c2af32b38 Merge pull request #698 from SchrodingersGat/stock-api 
Further API work
 2020-04-06 16:25:04 +10:00
Oliver Walters 92cb7211ce Rename 'image_url' to 'thumbnail' in PartBrief API 2020-04-06 12:57:04 +10:00
Oliver Walters 535f1994b1 Fix order API reference 2020-04-06 12:02:23 +10:00
Oliver Walters 87a09a7220 Rename Order.URL to Order.link 2020-04-06 11:56:52 +10:00
Oliver Walters a306ad0bc3 Alter "URL" to "link" for Company models 2020-04-06 11:36:25 +10:00
Oliver Walters 789712acbe Rename Build.URL -> Build.link 2020-04-06 11:28:35 +10:00
Oliver Walters bbe714c8f7 Bugs! 
Thanks, unit testing
 2020-04-06 11:21:34 +10:00
Oliver Walters b28487760a Rename Part.URL -> part.link 
- Previous migration needed some tweaking to get it to run... because.. why?
- It seems to pass when running manage.py migrate but fails when running manage.py test
- Stumped on this one
 2020-04-06 11:16:39 +10:00
Oliver Walters bd407cd226 Rename "URL" to "link" for StockItem and StockItemTracking models 2020-04-06 10:43:06 +10:00
Oliver Walters 2530313e68 Add part_detail and location_detail to the StockItem detail class 2020-04-06 08:38:10 +10:00
OliverandGitHub fce26c80b7 Merge pull request #697 from SchrodingersGat/stock-api-fix 
Stock api fix
 2020-04-05 23:09:03 +10:00
Oliver Walters 791eb63f35 Same fix for Part API 2020-04-05 22:59:45 +10:00
Oliver Walters 94b9878c8d Bug fix for stock api 
- If a part had an empty image, the thumbnail was improperly encoded
 2020-04-05 22:57:42 +10:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 7c09c20725 Update version.py 
Bump version number
 2020-04-05 00:56:16 +11:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub cdc4c5d6d5 Merge pull request #684 from SchrodingersGat/build-status-label-fix 
Display proper build status label
 2020-03-30 17:18:46 +11:00
Oliver Walters 34c097c46a Display proper build status label 2020-03-30 16:48:14 +11:00
OliverandGitHub e28fe6df6a Merge pull request #682 from SchrodingersGat/low-stock 
"Low Stock" badge
 2020-03-30 15:35:53 +11:00
Oliver Walters 0dc6d9d37e Improved visual layout 2020-03-30 15:04:56 +11:00
Oliver Walters 5aec3df7c9 Add stock-info labels to Part info page 2020-03-30 13:37:34 +11:00
Oliver Walters 06f28898a0 separate display for "no stock" and "low stock" in list view 2020-03-30 13:31:14 +11:00
Oliver Walters e8e0ab8416 Include 'minimum_stock' information in part list api 2020-03-30 13:21:33 +11:00
OliverandGitHub 00eada2c3c Merge pull request #679 from SchrodingersGat/on-order-fix 
Better filtering of annotations for Part-list API
 2020-03-26 18:07:53 +11:00
Oliver Walters c0650ba7f4 Add "buiding" icon in part list if no stock and none on order 2020-03-26 17:57:49 +11:00
Oliver Walters 713d7960a8 Fix on_order calculation 
- Take into account the number "received"
- Also fix unit tests
 2020-03-26 17:56:44 +11:00
Oliver Walters 6a78f6d451 Include quantity currently being build in Part API 2020-03-26 17:43:02 +11:00
Oliver Walters 41bbbdcd43 Improve query speed when calculating how many parts are on order 2020-03-26 17:31:59 +11:00
Oliver Walters 57123283f4 Better filtering of annotations for Part-list API 2020-03-26 17:08:01 +11:00
OliverandGitHub 864a21ac85 Merge pull request #678 from SchrodingersGat/on-order 
Add "On Order" badge
 2020-03-26 14:53:54 +11:00
Oliver Walters 99efbd4c40 If a part has no stock but is on order, display an "on-order" badge 2020-03-26 14:46:40 +11:00
Oliver Walters dae45875fb Add 'on_order' quantity to the part list API 2020-03-26 14:46:23 +11:00
OliverandGitHub d0f71ea6de Merge pull request #676 from maxbachmann/master 
use rapidfuzz instead of fuzzywuzzy
 2020-03-23 09:18:38 +11:00
OliverandGitHub c6f069028c Update version.py 
bump version number
 2020-03-22 20:19:16 +11:00
OliverandGitHub b6bc5e3bff Merge pull request #675 from SchrodingersGat/po-attachment 
Po attachment
 2020-03-22 20:18:09 +11:00
Oliver Walters 25caec4c53 Fix unit testings 2020-03-22 20:13:38 +11:00
OliverandGitHub 7d095213a5 Merge pull request #646 from inventree/dependabot/pip/django-2.2.10 
Bump django from 2.2.9 to 2.2.10
 2020-03-22 20:13:18 +11:00
Oliver Walters 672119fb92 Update README.md 2020-03-22 20:07:36 +11:00
Oliver Walters 7f269898c4 Flake - ignore media and static dirs 2020-03-22 20:02:13 +11:00
Oliver Walters 82be9db3df Make a fancy badge 2020-03-22 19:57:51 +11:00