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
13,581 Commits 6 Branches 99 Tags 484 MiB
6aeb818137
Commit Graph

2284 Commits

Author SHA1 Message Date
Oliver Walters
a0ca20ab04 Retrieve all stock item test results at once 2022-04-29 01:27:58 +10:00
Oliver Walters
6b4592b3dc Display error if stock item is "double allocted" 2022-04-29 01:10:05 +10:00
Oliver Walters
81638d06cf Show or hide items based on output BOM 2022-04-29 00:51:56 +10:00
Oliver Walters
6e52ca2178 Refactor button callbacks 
- Add button to expand all output rows
- Add button to collapse all output rows
 2022-04-29 00:44:29 +10:00
Oliver Walters
3da6446373 Allow sorting of build output table by allocated items 2022-04-29 00:32:33 +10:00
Oliver Walters
6c6ebe70c2 Update progress bars for build output allocation 2022-04-29 00:27:27 +10:00
Oliver Walters
df9a33935d Row button fixes 2022-04-28 23:26:08 +10:00
Oliver Walters
4a81c058d6 Function to reload allocation table data 2022-04-28 23:14:37 +10:00
Oliver Walters
cb7c4396fb Refactor build page template 
- Only load build outputs table as required
 2022-04-28 22:59:24 +10:00
Oliver Walters
f531e354b9 Allow completion of partially allocated build outputs 
- Requires manual acceptance from user
 2022-04-28 21:54:38 +10:00
Oliver
72bcea2f6d Better caching and rendering of sub tables for particular build outputs 2022-04-28 17:53:27 +10:00
Oliver
b8f274c680 Request allocations for entire build, and cache 2022-04-28 17:38:08 +10:00
Oliver
e6c95bf6b2 Cache tracked BOM items for the build order 2022-04-28 17:08:43 +10:00
Oliver
74a08be5be Load (and cache) tracked BOM items for this build output 2022-04-28 17:00:23 +10:00
Oliver
a48c802576 Sort by test status 2022-04-28 16:54:29 +10:00
Oliver
d894302e62 Request build output test result information 2022-04-28 16:54:02 +10:00
Oliver
2b46ed300e Client side pagination and sorting 2022-04-28 16:18:40 +10:00
Oliver
63145c90b0 Server-side sorting of "build output" column 2022-04-28 16:14:23 +10:00
Oliver
ba3bcdba89 Add switchable columns to build output table 2022-04-28 15:50:10 +10:00
Oliver
5a77156051
Merge pull request #2886 from SchrodingersGat/remove-demo-mode 
Remove "demo mode"
 2022-04-28 14:13:16 +10:00
Oliver
6e7b307423 Prevent "null" from being displayed as part units 2022-04-28 09:51:51 +10:00
Matthias
f1ee206c53
fix typo 2022-04-28 00:37:55 +02:00
Matthias Mair
dfd51174cb
Merge branch 'inventree:master' into matmair/issue2694 2022-04-27 17:48:19 +02:00
Matthias Mair
37e74074dd
Merge branch 'inventree:master' into matmair/issue2385 2022-04-27 17:46:57 +02:00
Oliver Walters
e809fd9a2c Remove database metrics from system info tab 2022-04-27 23:07:26 +10:00
Oliver Walters
fc3b062188 Mark injected strings as safe 2022-04-27 22:09:25 +10:00
Oliver Walters
06da120ef3 Hide entry box for changing password 2022-04-27 22:03:55 +10:00
Oliver Walters
fc4de6c7b8 Remove other demo references 2022-04-27 22:00:58 +10:00
Oliver Walters
4a843908ec Add customize option to hide admin link in user menu 2022-04-27 21:56:04 +10:00
Oliver Walters
090445f2c3 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-27 21:45:08 +10:00
Oliver Walters
24af2bd2c8 Update console output for forms.js 2022-04-27 21:45:00 +10:00
Matthias
37ea6e119e
just center content 2022-04-27 13:21:23 +02:00
Matthias
9c06d3b082
throw out markdown calculatinf 2022-04-27 13:21:10 +02:00
Matthias
6c23c94700
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2301 2022-04-27 13:13:04 +02:00
Matthias
a02edca2d5
add another spacer 2022-04-27 13:12:22 +02:00
Oliver
481350b138 Refactor available quantity calculation for BOM table 2022-04-27 09:16:57 +10:00
Oliver
2a24fc43e7 Text formatting 2022-04-27 09:07:10 +10:00
Oliver
08ab99adc6 Build order table improvements: 
- Display tick / cross badge for stock availability in build order table
- Correctly order available quantity
 2022-04-27 09:04:57 +10:00
Oliver Walters
340d4d8a89 Launch new forms 2022-04-27 00:12:12 +10:00
Oliver Walters
bf11e8361e Add (empty) callbacks to prefix buttons 2022-04-26 22:18:27 +10:00
Oliver Walters
c66cd1d51b Adds button to expand row for "extra" information 2022-04-26 22:14:01 +10:00
Oliver Walters
b8ca7fb092 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 
# Conflicts:
#	InvenTree/templates/js/translated/model_renderers.js
 2022-04-26 21:22:31 +10:00
Oliver
fec43f126b
Merge pull request #2876 from SchrodingersGat/default-batch-code 
Default batch code
 2022-04-26 20:47:28 +10:00
Oliver Walters
3f92f009e4 Add configurable setting for batch code generation 2022-04-26 20:00:06 +10:00
Oliver Walters
7db11b627b Refactor PartSalePriceBreak and PartInternalPriceBreak tables to use the API 
- Remove old server-side views
- Simplify code
 2022-04-26 19:53:09 +10:00
Matthias
1bce7b745e
add custom logo option 2022-04-24 16:13:44 +02:00
Matthias
2847eef71c
load missing tag 2022-04-24 15:13:31 +02:00
Matthias
f2d0537198
set navbar message via config file 2022-04-24 15:12:03 +02:00
Matthias
1127bf2497
make it possible to resitrict the about modal 2022-04-24 01:02:41 +02:00
Matthias
ff9d8e7b6b
use instance title in version string 2022-04-24 00:28:27 +02:00
Matthias
9673d81014
remove InvenTree name where not needed 2022-04-24 00:23:26 +02:00
Matthias
54d8a4e802
use server title instead of InvenTree 2022-04-24 00:21:33 +02:00
Matthias
7834171c2a
[FR] White labeling 
Fixes #2301
 2022-04-23 23:38:49 +02:00
Matthias Mair
b118890676
Merge branch 'inventree:master' into matmair/issue2694 2022-04-23 21:30:01 +02:00
Matthias Mair
2f0291864f
Merge branch 'inventree:master' into matmair/issue2385 2022-04-23 21:29:37 +02:00
Oliver Walters
f504dfe797 part variant table now displays information about variant stock quantities 2022-04-22 00:20:32 +10:00
Oliver Walters
aa20d84cc1 Update javascript rendering in build table 2022-04-22 00:00:50 +10:00
Oliver Walters
ec34d23bfc Update javascript rendering in BOM table 2022-04-21 23:58:12 +10:00
Oliver Walters
3b4d0c2f9c Merge remote-tracking branch 'inventree/master' into variant-available 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2022-04-21 20:13:51 +10:00
Matthias Mair
544a590b7a
Merge branch 'inventree:master' into plugin-mark-sample 2022-04-19 18:24:21 +02:00
Matthias Mair
b3dca68c6b
Merge branch 'inventree:master' into matmair/issue2694 2022-04-19 18:24:12 +02:00
Matthias Mair
1399b4fbb3
Merge branch 'inventree:master' into matmair/issue2385 2022-04-19 18:23:49 +02:00
Oliver Walters
db897d5dce JS linting 2022-04-19 20:47:37 +10:00
Oliver Walters
1fb94bf04b Allow "tracked" stock items to be installed, rather than just serialized 2022-04-19 20:35:54 +10:00
Oliver Walters
0e67ea8e95 Change ordering of stock item form fields 2022-04-19 20:28:45 +10:00
Oliver Walters
7531ef8e5f Prevent annoying error messages when notification request fails 2022-04-19 20:28:35 +10:00
Oliver Walters
2315d0cb5d Adds ability to filter stock item tables by "tracked" status 
- Also fixes some slight errors in the API filtering logic
 2022-04-19 18:13:48 +10:00
Oliver Walters
1dfbd30294 Bug fix for displaying batch information 2022-04-19 17:53:58 +10:00
Oliver
5240c60e0b Render part information in stock item tracking table (if provided) 2022-04-19 13:14:54 +10:00
Oliver
e5eb1f4513 Adds button to refresh stock item tracking table 2022-04-19 13:09:14 +10:00
Oliver Walters
8a6b16c1d1 Display batch code for stock items in forms 2022-04-18 23:10:38 +10:00
Oliver Walters
6beea0a557 Render batch code in stock adjustment dialog 2022-04-18 22:56:31 +10:00
Oliver Walters
33401cb207 Adds ability to filter stockitem list by "has_batch" parmeter 2022-04-18 22:34:00 +10:00
Oliver Walters
6f5b560fb6 Update BOM table to include variant stock information 2022-04-15 22:45:22 +10:00
Oliver Walters
18de4676dc Explicitly mark "parent" field in PartCategory and StockLocation as not required in API form fields 2022-04-15 19:22:06 +10:00
Oliver
dfa3bbf655 Add ability to include test results from "installed items" in table 2022-04-14 12:49:27 +10:00
Oliver
46892f9288 Hide ID values by default in model_renderers.js 2022-04-14 12:30:01 +10:00
Oliver
40d6a1470f Tweak for part.js 2022-04-14 11:04:25 +10:00
Oliver
7335bfae19 Fix templated string 2022-04-14 10:59:52 +10:00
Matthias Mair
a6a03acf92
re-add plugin on startup switch 2022-04-14 01:22:09 +02:00
Oliver
93257d547c
Merge pull request #2806 from SchrodingersGat/bom-serializer-quantity 
Bom serializer quantity
 2022-04-13 07:43:25 +10:00
Oliver Walters
1c60d4e152 Refactor notes for "purchase order" 2022-04-10 19:55:32 +10:00
Oliver Walters
e1784c93b2 Simplification 2022-04-10 18:03:19 +10:00
Oliver Walters
641785a02b Refactor into a monolithic js function 2022-04-10 17:53:09 +10:00
Oliver Walters
241e2e35c0 Display part notes inline, and allow updating via API 2022-04-10 15:58:36 +10:00
Oliver Walters
953c7bc7e4 Adds easymde (v2.16.1) 2022-04-10 15:34:02 +10:00
Matthias
3ffe51b4c3
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2385 2022-04-08 01:58:17 +02:00
Oliver Walters
e225d3b765 Fix action buttons in "part" table on category page 2022-04-07 19:09:43 +10:00
Oliver Walters
e1fbd961e5 Refactor form renderer functions 2022-04-07 19:05:25 +10:00
Oliver Walters
ed69f06620 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-04-07 18:54:00 +10:00
Oliver Walters
eef768e01f Merge remote-tracking branch 'inventree/master' into bom-serializer-quantity 2022-04-07 18:53:43 +10:00
Oliver Walters
f3075d2151 Build table now also shows availability of substitute stock 2022-04-07 18:48:23 +10:00
Oliver Walters
acc6cb8729 Fix calculation of "can_build" 2022-04-07 17:47:24 +10:00
Oliver Walters
6aceb24e41 Include available substitute stock when calculating total availability in BOM table 2022-04-07 17:45:11 +10:00
eeintech
ad366ef0bd Fix part and po files import 2022-04-06 16:45:23 -04:00
Oliver
24c64d7479 Bug fix for "inverted" logic when hiding inactive parts from search results 2022-04-06 12:21:19 +10:00
Oliver
27dac5af97 Fix search errors 
- Do not show API error messages for requests which were intentionally aborted
- Prevents a large number of error messages being displayed when search text is changed
 2022-04-06 09:42:07 +10:00
Oliver
ac721a544d
Merge pull request #2803 from SchrodingersGat/barcode-fix 
Barcode scanning fixes
 2022-04-06 09:27:42 +10:00
Matthias Mair
41b75e4928
Merge branch 'inventree:master' into matmair/issue2385 2022-04-05 02:05:05 +02:00
Matthias Mair
4ab27e5f3c
Merge branch 'inventree:master' into matmair/issue2694 2022-04-05 02:03:40 +02:00
Matthias Mair
346327b545
Merge branch 'inventree:master' into plugin-mark-sample 2022-04-05 02:03:29 +02:00
Matthias
bdc62dfcc3
mark active sample code as a sample 2022-04-04 23:53:35 +02:00
Matthias
1eb511e8a0
user notification settings 2022-04-04 23:46:19 +02:00
Oliver Walters
c93f9c94f3 Change column title 2022-04-05 00:33:54 +10:00
Oliver Walters
0908aa8c8c Allow sorting of part table by unallocated_stock 2022-04-05 00:31:44 +10:00
Oliver Walters
58003bc2cb Refactor model renderer functions 2022-04-05 00:27:37 +10:00
Oliver Walters
15253435af Adjustments for partStockLabel function 2022-04-05 00:02:11 +10:00
Oliver
782a0f3576 Fix for scanIntoLocation function 2022-04-04 16:23:17 +10:00
Oliver
7dae05acc5 Fix for scanItemsIntoLocation function 
- Accept list of objects rather than pk values
- Conform to API requirements
 2022-04-04 16:20:19 +10:00
Oliver
2c8e274aa9 Tweaks for barcode scanning functionality 
- Prevent javascript errors

(cherry picked from commit 9129a42a3e2a5c5939e6002d3b4010b3fd9cc20e)
 2022-04-04 14:24:28 +10:00
Kálmán Rózsahegyi
ade5a81a1a Enhance partStockLabel with ordering/building quantites 2022-04-03 12:36:46 +02:00
Kálmán Rózsahegyi
bc4b66e7d3 Render partStockLabel based on available/in stock quantites 2022-04-03 12:36:37 +02:00
Kálmán Rózsahegyi
d912846e41 Use available quantities in part table, enhance stock badge 2022-04-03 12:35:59 +02:00
Kálmán Rózsahegyi
a9f7457c12 New part table filter on available stock 2022-04-03 12:30:53 +02:00
Oliver Walters
4c6ad6facf Other changes as requested 2022-03-30 12:42:57 +11:00
Oliver Walters
ba7035d7b6 JS litning fixes 2022-03-29 23:52:37 +11:00
Oliver Walters
016d802a10 Fixes for input autofocus, etc 2022-03-29 23:49:06 +11:00
Oliver Walters
f724f4a845 Add search preview for purchase orders and sales orders 2022-03-29 23:38:01 +11:00
Oliver Walters
2a604c244e Add search results for "company" 2022-03-29 23:29:17 +11:00
Oliver Walters
1f003b3f54 Add results for part categories and stock locations 2022-03-29 23:27:44 +11:00
Oliver Walters
a551bf1e81 Add options to control what is shown in search preview window 2022-03-29 23:27:25 +11:00
Oliver Walters
4bb95de4f9 Re-add button to submit "search" form and show full results 2022-03-29 23:19:23 +11:00
Oliver Walters
cc1501283d Refactoring 2022-03-29 22:59:23 +11:00
Oliver Walters
f1876ae28b Add a "searching..." indicator to show progress 2022-03-29 22:48:54 +11:00
Oliver Walters
11a6052871 remove the old search bar 2022-03-29 22:46:00 +11:00
Oliver Walters
22ee6614cc Render links for search results 2022-03-29 22:40:47 +11:00
Oliver Walters
78e5a685dc Display results for parts and stock items 
- Use the existing rendering functions
 2022-03-29 22:35:47 +11:00
Oliver Walters
51d26b1d16 Skeleton for displaying search results 2022-03-29 20:49:23 +11:00
Oliver Walters
92bff3d1b7 Merge branch 'master' into search-megamenu 2022-03-28 21:56:30 +11:00
Oliver Walters
89d0e41ebc JS lint fix 2022-03-28 20:59:34 +11:00
Oliver Walters
13af1cb853 Hide label printing buttons of labels are not enabled 2022-03-28 20:44:33 +11:00
Oliver Walters
b62905d5c4 Add user setting to enable / disable label printing 2022-03-28 20:38:57 +11:00
Oliver Walters
05344a3675 Only check for label printing plugins if plugins are enabled 2022-03-28 20:36:34 +11:00
Oliver Walters
2ce5b7c896 Make plugins_enabled variable available to javascript code 2022-03-28 20:25:47 +11:00
Oliver Walters
c4ac7e1877 Add callback for search text entery 2022-03-28 20:24:07 +11:00
Oliver Walters
7d68b3209b Add callbacks for search panel opening and closing 2022-03-28 10:18:49 +11:00
Oliver Walters
ffb89af9e5 Move search results panel into new template 2022-03-28 10:10:02 +11:00
Oliver Walters
ce396759a1 Add new javascript file (search.js) 
- Empty, for now
 2022-03-28 10:09:09 +11:00
Oliver Walters
2976545988 Adds a new "offcanvas" section for search results 2022-03-28 10:02:55 +11:00
Matthias
e1b3de001f
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2694 2022-03-27 23:19:41 +02:00
Oliver Walters
441a947dbb Fix another quantity 2022-03-27 21:06:11 +11:00
Oliver Walters
ab7eda9d2c Add new button to navbar 2022-03-27 21:04:14 +11:00
Oliver Walters
ce323d80ea Fix floating point issues 2022-03-27 20:29:59 +11:00
Matthias
68a02af9cd
finish renaming SO / PO 2022-03-27 01:41:16 +01:00
Matthias
28cec5e9e5
make function simpler 2022-03-27 01:13:09 +01:00
Matthias
bff2fb81f3
rename AdditionalLineItems to ExtraLine 2022-03-27 01:11:25 +01:00
Oliver Walters
5b949b6f60 Fix sorting for location column in part table 2022-03-27 07:45:45 +11:00
Kálmán Rózsahegyi
a523401a2f QR code scanner using camera if available 2022-03-26 19:41:51 +01:00
Oliver
011d97db3d Tweak display of label printing plugins 2022-03-25 14:20:25 +11:00
Oliver Walters
293294cce8 Merge remote-tracking branch 'inventree/master' into order-parts-wizard 2022-03-24 20:54:38 +11:00
Oliver
708ba566cb URL fix 2022-03-24 16:44:46 +11:00
Oliver
b2b9ceec46 javascript fixes 2022-03-24 16:38:01 +11:00
Oliver
2fc522ad15 Hard code url - it is not always available 2022-03-24 16:34:31 +11:00
Oliver
6c25a5805d Allow offloading of label printing to the configured plugin 2022-03-24 14:57:01 +11:00
Oliver
f1f07a1977 Extract plugin information from label printing request 2022-03-24 13:31:01 +11:00
Oliver
e62b6063bb If printing plugins are available, let the user select them when printing 2022-03-24 13:20:26 +11:00
Oliver Walters
4fc605ee28 Render a form for ordering parts 2022-03-23 21:26:11 +11:00
Oliver
f92aa07f82 Fix null values in build order serial number field 2022-03-23 12:01:50 +11:00
Oliver Walters
f2806b2e41 Tweaks for existing form code 2022-03-21 23:19:27 +11:00
Oliver Walters
b4f8136142 Don't add "remove row" button if there is only one row 2022-03-21 21:58:21 +11:00
Matthias Mair
ce68ee3781
Merge branch 'inventree:master' into matmair/issue2694 2022-03-20 22:15:27 +01:00
Oliver Walters
ace61c6aab Little bit of eye candy 2022-03-20 19:38:40 +11:00
Oliver Walters
9cc2cc5683 Fix asynchronous order of events for "mark all as read" button 2022-03-20 19:36:52 +11:00
Oliver Walters
d2969d0235 Adds a per-user setting to allow sending of emails for notification events 2022-03-20 19:19:42 +11:00
Matthias Mair
cc50eff3a1
Merge branch 'master' into matmair/issue2694 2022-03-20 02:29:20 +01:00
Matthias
2861ee0843
another style fix 2022-03-20 02:26:36 +01:00
Matthias
20b0ccefea
style fix 2022-03-20 02:23:11 +01:00
Matthias
c139b90598
move button 2022-03-20 02:05:30 +01:00
Matthias
a4c9dfdd6f
add read all endpoint 2022-03-20 02:05:18 +01:00
Matthias
0fa8af6cd8
translate the notifications too 2022-03-20 00:58:45 +01:00
Matthias
b0e6b6071f
make requeseted changes from code review 2022-03-20 00:29:58 +01:00
Matthias
62a81c1a62
Change icons 
https://github.com/inventree/InvenTree/pull/2372#issuecomment-1073005561
 2022-03-20 00:26:04 +01:00
Matthias
028fff1473
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2022-03-20 00:23:29 +01:00
Oliver Walters
467febf9ea The part parameter table is now loaded via the API 2022-03-19 22:09:17 +11:00
Oliver Walters
335f0ceb79 Improve form rendering for part parameter template 2022-03-18 23:20:53 +11:00
Oliver
278887e11c
Merge pull request #2751 from SchrodingersGat/sales-order-allocation-fixes 
Sales order allocation fixes
 2022-03-17 09:09:20 +11:00
Oliver
38d33a3f5f Display a message if scheduling information is unavailable for a given part 2022-03-16 23:48:49 +11:00
Oliver
e2179fb4d1 Fixes for display of allocation tables (build order and / or sales order) 
- Hide these tables where they do not make sense for a given Part or StockItem
- Remove redundant "loadStockAllocationTable" function
 2022-03-16 23:25:51 +11:00
Oliver
6ca61e2cd7 Fix rendering for "sales order allocations" table 2022-03-16 23:09:18 +11:00
Oliver
d1338e210e Only display "outstanding" sales order allocations in table 2022-03-16 23:01:46 +11:00
Matthias Mair
4100834ce9
Merge branch 'inventree:master' into matmair/issue2279 2022-03-14 23:14:29 +01:00
Matthias
4b8a2e3c1f
fix js function call 2022-03-11 02:18:46 +01:00
Matthias
771fc6ada8
style fixes 2022-03-11 01:44:13 +01:00
Matthias
76698ec627
add js function for PO 2022-03-11 00:57:31 +01:00
Matthias
06bd7130f5
remove dead code 2022-03-11 00:51:20 +01:00
Matthias
8fbd776419
make naming more abstract 2022-03-11 00:49:49 +01:00
Matthias
b7e5f6a109
name more abstract 2022-03-11 00:47:24 +01:00
Matthias
17d421fb7e
fix export order 2022-03-11 00:46:56 +01:00
Matthias
55df46c8b9
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2694 2022-03-10 23:50:42 +01:00
Oliver
cf2c078952 Add spinning logo 2022-03-09 15:27:44 +11:00
Oliver
4cd41bd0a3 Display "loading" until allocations loaded 2022-03-09 15:23:23 +11:00
Oliver
4191a043b2 Add "exclude_location" to build order auto-allocation 2022-03-09 14:57:57 +11:00
Oliver
fda556c289
Merge pull request #2695 from SchrodingersGat/scheduling 
[WIP] Scheduling
 2022-03-09 12:06:55 +11:00
Oliver
c699e208cf JS linting 2022-03-09 10:41:07 +11:00
Oliver
d56fed3211 Fixes for "duplicate stock item" form 
- Redirect to the new stock item
- Display a success message
 2022-03-09 10:34:47 +11:00
Oliver
f7d724aa0c Merge remote-tracking branch 'inventree/master' into scheduling 
# Conflicts:
#	InvenTree/InvenTree/version.py

(Update API version)
 2022-03-08 12:25:36 +11:00
Matthias Mair
2c8e7ac810
Merge branch 'inventree:master' into matmair/issue2279 2022-03-07 00:03:47 +01:00
Matthias Mair
b9ee436110
Merge branch 'inventree:master' into matmair/issue2694 2022-03-07 00:03:33 +01:00
Matthias
66601a516b
style fix 2022-03-06 23:50:29 +01:00
Matthias
e2f54880f0
style fix 2022-03-06 23:46:59 +01:00