inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
10,039 Commits 9 Branches 164 Tags
d5cf2b08accdf84f53284012aa27d9ef2bfb0d2a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment 
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
 2021-11-11 12:35:59 +11:00
OliverandGitHub 9a017d950e Merge pull request #2288 from matmair/matmair/issue2278 
Add setting for enabeling reports
 2021-11-11 11:23:32 +11:00
OliverandGitHub 95e63d1278 Merge pull request #2289 from matmair/ui-tewaks2 
remove empty breadcrumb space in settings
 2021-11-11 11:03:21 +11:00
OliverandGitHub 4d6189653e Update README.md 2021-11-11 08:39:28 +11:00
OliverandGitHub 088e72c0b5 Merge pull request #2286 from SchrodingersGat/whoops-bug-fix 
Fixes bug extracting list of bom items
 2021-11-10 14:20:40 +11:00
Oliver 4a26f274af fixing silly bug I introduced 2021-11-10 14:00:30 +11:00
OliverandGitHub 5e8aab9137 Merge pull request #2285 from SchrodingersGat/bom-quantity 
Normalize "available stock" quantity before exporting
 2021-11-10 13:44:43 +11:00
Oliver 1bb51a7309 Normalize "available stock" quantity before exporting 2021-11-10 13:27:59 +11:00
OliverandGitHub ae7cde7547 Merge pull request #2281 from SchrodingersGat/stock-sort 
Adds "stock" column sorting for stock table
 2021-11-10 12:20:07 +11:00
OliverandGitHub f2c1791370 Merge pull request #2283 from SchrodingersGat/install-into-improvements 
Improve options for installing a part into another part
 2021-11-10 11:39:12 +11:00
Oliver 986a13864a Exclude 'serial_int' when exporting stock data 2021-11-10 11:37:30 +11:00
Oliver 919f182c25 Remove debug messages 2021-11-10 11:30:11 +11:00
Oliver ba11a73f91 Fix for saving stock item objects 2021-11-10 11:22:58 +11:00
Oliver bd81eba380 PEP style fixes 2021-11-10 11:13:30 +11:00
Oliver 6a534e0322 Improve options for installing a part into another part 
- Allow "variant" parts when the BOM specifies that variants are allowed for a particular BOM item
 2021-11-10 11:11:52 +11:00
Oliver 067f12d5eb PEP fixes 2021-11-10 11:01:12 +11:00
Oliver 25ce043337 Adjust ordering sequence for StockItem 2021-11-10 11:00:43 +11:00
Oliver 738ba4eddf Data migration to initially update serial number fields for all stock items 
- Also automatically updates serial_int field when saving StockItem
 2021-11-10 10:59:48 +11:00
Oliver 257be18d79 Add 'serial_int' field to stockitem model 
- Allows for integer sorting of stock items
 2021-11-10 10:47:17 +11:00
Oliver 85b906f49d Adds "stock" column sorting for stock table 2021-11-10 09:48:52 +11:00
OliverandGitHub ab32ab0b3b Merge pull request #2277 from SchrodingersGat/multi-report-fix 
Fix for printing multiple reports at once
 2021-11-10 09:26:55 +11:00
OliverandGitHub 558c2cc275 Merge pull request #2275 from SchrodingersGat/settings-via-api 
Settings via api
 2021-11-10 09:06:02 +11:00
Oliver 56bf0f0487 Fix for printing multiple reports at once 
(bug introduced in 79434bb)
 2021-11-10 09:03:15 +11:00
Oliver 3dae0c9c1c Remove old unit test code 2021-11-10 08:48:51 +11:00
Oliver cfb873bb4f Bug fix for loading part table without enabling grid view 2021-11-09 22:47:19 +11:00
Oliver db31bf91e6 Improve display of "no response from server" message 2021-11-09 22:41:54 +11:00
Oliver e303b5a39b Catch for null value for settings choices 2021-11-09 22:37:50 +11:00
Oliver 8d7b73e2a8 Adds support for "multiple choice" field 2021-11-09 22:25:42 +11:00
Oliver 721d10a9ec Allow empty URLs 2021-11-09 22:14:26 +11:00
Oliver 1e80e33634 typo fix 2021-11-09 21:49:14 +11:00
Oliver 11dd187df2 javascript linting 2021-11-09 21:43:47 +11:00
Oliver 6347345c23 Ignore template files in common 2021-11-09 21:40:35 +11:00
Oliver 7dce9f3f3b PEP fixes 2021-11-09 21:37:54 +11:00
Oliver 476d2545ad Remove old server-side view 2021-11-09 21:33:32 +11:00
Oliver eb5b810be0 Update displayed setting when API returns success 2021-11-09 21:29:31 +11:00
Oliver 5df4374607 javascript for editing settings via API 2021-11-09 21:16:37 +11:00
Oliver 324335a620 Convert to "native value" in the serializer 2021-11-09 17:43:36 +11:00
Oliver 4433befbdc Add list of 'choices' (read only) to serializer 
- Check that the specified value is one of the valid options (if provided)
 2021-11-09 17:21:59 +11:00
Oliver 07851f0b2c Include 'setting type' in API data 2021-11-09 17:07:41 +11:00
Oliver 0374c27d7c Adds "detail" view for user setting 
- Users can only view / edit their own settings
 2021-11-09 16:14:10 +11:00
Oliver f3b4f7aa28 Add "detail" view for global settings objects 
- Can view and edit (but not delete)
- User must have "staff" status to access
 2021-11-09 16:07:25 +11:00
Oliver cb583eb466 Add LIST endpoint for global settngs and user settings 
- Read only, cannot create new settings
- User settings filters against the user making the request
 2021-11-09 15:59:09 +11:00
OliverandGitHub 6c8f04b387 Merge pull request #2274 from SchrodingersGat/po-receive-fix 
Add unit test to check an "empty" (null) barcode can be supplied
 2021-11-09 12:38:56 +11:00
Oliver 30684685f9 Add unit test to check an "empty" (null) barcode can be supplied 2021-11-09 12:07:57 +11:00
OliverandGitHub 1520c296dd Merge pull request #2270 from SchrodingersGat/navbar-fix 
Fixes navbar menu positioning for smaller screens
 2021-11-08 17:44:21 +11:00
OliverandGitHub 8fee117870 Merge pull request #2273 from SchrodingersGat/owner-filter 
Adds search capability to "owner" API
 2021-11-08 17:11:20 +11:00
Oliver f1eaeef949 PEP fixes 2021-11-08 16:53:43 +11:00
Oliver ca0619a482 Adds API filtering for the "user" list 2021-11-08 16:53:15 +11:00
Oliver 3d553cf7de Adds search capability to "owner" API 
- Currently a bit of a hack, but it works...
 2021-11-08 16:49:15 +11:00
OliverandGitHub 2c889fbcff Merge pull request #2272 from SchrodingersGat/convert-to-variant-fix 
Convert to variant fix
 2021-11-08 15:56:45 +11:00
OliverandGitHub 619c029d3d Merge pull request #2271 from SchrodingersGat/stock-actions-fix 
Fix missing actions for stock item
 2021-11-08 15:10:46 +11:00
Oliver cb075ed2c2 Fix logic for converting stock items to applicable variants 2021-11-08 15:10:41 +11:00
Oliver 64f5007d3a Fix missing actions for stock item 
(cherry picked from commit c128438ebf)
 2021-11-08 14:50:03 +11:00
Oliver c128438ebf Fix missing actions for stock item 2021-11-08 14:47:14 +11:00
OliverandGitHub bcc086657a Merge pull request #2269 from SchrodingersGat/bo-form 
Improvements for build order forms
 2021-11-08 14:28:34 +11:00
Oliver 35cfa387d1 Fixes navbar menu positioning for smaller screens 2021-11-08 13:38:03 +11:00
Oliver b2ae346343 Provide model-level default function option 2021-11-08 13:30:59 +11:00
Oliver 8d5c3ab18a add extra icons for build order form 2021-11-08 13:10:33 +11:00
OliverandGitHub 9c2193a4cc Merge pull request #2265 from matmair/matmair/issue2257 
Matmair/issue2257
 2021-11-08 11:10:53 +11:00
OliverandGitHub a12baadc09 Merge pull request #2266 from SchrodingersGat/login-tweaks 
Login tweaks
 2021-11-08 10:19:23 +11:00
OliverandGitHub 96e8c499fc Merge pull request #2262 from matmair/ui-tweaks 
Small UI tweaks
 2021-11-08 10:00:20 +11:00
Oliver ac97edd18b JS linting 2021-11-08 09:58:55 +11:00
Oliver c9924470ad Replace dialog messages with alerts 2021-11-08 09:44:45 +11:00
Oliver ef75838ab8 Properly display notifications when logging in 2021-11-08 09:34:57 +11:00
Oliver 079c08ef7d Tweaks to account screens css 2021-11-08 09:34:42 +11:00
OliverandGitHub 7ee5f6c71b Merge pull request #2261 from SchrodingersGat/shadow 
Adds a fancy shadow
 2021-11-05 14:21:14 +11:00
Oliver 42155b2e05 Adds a fancy shadow 2021-11-05 13:51:26 +11:00
OliverandGitHub 174100ed6d Merge pull request #2260 from SchrodingersGat/sales-order-reference-fix 
Check if customer exists when rendering sales order template
 2021-11-05 11:23:13 +11:00
Oliver 1743111613 Check if customer exists when rendering sales order template 
Fixes https://github.com/inventree/InvenTree/issues/1742
 2021-11-05 11:03:38 +11:00
OliverandGitHub f970255066 Merge pull request #2259 from SchrodingersGat/dialog-escapes 
Allow escape key on barcode modal
 2021-11-05 10:58:57 +11:00
OliverandGitHub cb990af3a9 Merge pull request #2258 from SchrodingersGat/typo-fix 
Typo fix
 2021-11-05 10:43:49 +11:00
Oliver 1f1cf9f9e4 Allow escape key on barcode modal 2021-11-05 10:39:03 +11:00
Oliver bf4de526ac Typo fix 2021-11-05 10:20:47 +11:00
OliverandGitHub 46fc1e19d5 Merge pull request #2254 from SchrodingersGat/docker-stable 
Target production docker-compose script to inventree:stable
 2021-11-05 08:15:49 +11:00
Oliver ab3acc4601 Target production docker-compose script to inventree:stable 2021-11-05 07:52:15 +11:00
OliverandGitHub 083967b156 Merge pull request #2198 from SchrodingersGat/stock-item-forms 
Stock item forms
 2021-11-05 07:37:33 +11:00
Oliver 185924e1f8 More linting 2021-11-05 00:35:47 +11:00
Oliver 5a0ff4c077 JS linting 2021-11-05 00:32:11 +11:00
Oliver 78ac40083a Fixes for stock api unit tests 
- Remove old unit tests
- Require quantity when creating a new stock item
 2021-11-05 00:27:26 +11:00
Oliver f27acde934 More fixes 
- Allow stock item creation for inactive parts
- Better handling of successful stock item creation
- Disable fields rather than hiding them
 2021-11-05 00:02:55 +11:00
Oliver b41dbba2b0 Correctly handle serialization of newly created stock 2021-11-04 23:18:59 +11:00
Oliver 3be4acf3ef More refactoring for notifications 
- Adds default behaviour for successful stock item creation
 2021-11-04 23:09:49 +11:00
OliverandGitHub ce30b852e7 Merge pull request #2252 from SchrodingersGat/hide-inactive 
Add option to hide inactive parts in search preview window
 2021-11-04 23:06:54 +11:00
Oliver 97326d9fb2 Display stock item owner (if applicable) 2021-11-04 22:45:11 +11:00
Oliver b65f950864 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 22:40:09 +11:00
Oliver 71bb6fff50 Add option to hide inactive parts in search preview window 2021-11-04 22:25:35 +11:00
OliverandGitHub ceba5b7312 Merge pull request #2249 from SchrodingersGat/search-dropdown-fix 
Fixes for search auto-complete dropdown menu
 2021-11-04 17:26:12 +11:00
Oliver f0e44f0efd Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-04 17:24:30 +11:00
Oliver 76b5bc067a Fix notes field 2021-11-04 17:06:52 +11:00
Oliver 3ceb6f6ba8 Fix barcode input 2021-11-04 17:04:47 +11:00
Oliver b1598cfd10 - style fixes 
- add part description as mouse-over text
 2021-11-04 17:02:52 +11:00
OliverandGitHub 2130b02e7f Merge pull request #2193 from matmair/matmair/issue2181 
Add missing part import fields
 2021-11-04 16:54:30 +11:00
OliverandGitHub 345bccb9bc Merge pull request #2248 from SchrodingersGat/email-fixes 
Fixes for low-stock emails
 2021-11-04 16:48:28 +11:00
Oliver 9cfcb6579f Fixes for search auto-complete dropdown menu 
- Fix rendering of badges
- Menu fills out right-to-left
 2021-11-04 16:48:24 +11:00
Oliver 39d3a127e1 Template improvements 2021-11-04 16:19:57 +11:00
Oliver 3a7f8c9196 Fix comparison operator 2021-11-04 16:18:49 +11:00
Oliver 75d7530e30 Fix missing tag in template 2021-11-04 16:17:05 +11:00
Oliver 5ae6241083 Fixes for low-stock emails 
- Include variant stock in test
- Improve email template
 2021-11-04 16:15:11 +11:00
OliverandGitHub 3b052e6bce Merge pull request #2247 from SchrodingersGat/tree-view-fixes 
Fix for tree-view
 2021-11-04 15:30:07 +11:00
OliverandGitHub 170d8d11d3 Merge pull request #2246 from SchrodingersGat/build-order-notification 
Build order notification
 2021-11-04 15:23:39 +11:00