Commit Graph

4750 Commits

Author SHA1 Message Date
Oliver
3449848682
Merge pull request #1266 from SchrodingersGat/barcode-data-fix
Limit barcode hash to printable characters.
2021-01-31 22:29:19 +11:00
Oliver Walters
97140b19ba Limit barcode hash to printable characters.
This is a dirty filthy hack, as the web-input strips non printable chars when they are typed in (but will accept them if they are copy-pasted)
2021-01-31 21:45:34 +11:00
Oliver Walters
53d1a714f6 Merge branch 'master' of https://github.com/SchrodingersGat/InvenTree 2021-01-31 20:46:40 +11:00
Oliver Walters
4b728520ac Merge remote-tracking branch 'inventree/master' 2021-01-31 20:46:09 +11:00
Oliver
27b8928a10
Merge pull request #1263 from SchrodingersGat/table-translations
Table translations
2021-01-30 09:48:47 +11:00
Oliver
cb81d8b66a
Merge pull request #1262 from SchrodingersGat/hide-barcode-button
Hide main QR button if setting is disabled
2021-01-29 13:06:48 +11:00
Oliver Walters
8fda2cf745 Fixes for unit tests 2021-01-29 12:47:46 +11:00
Oliver Walters
4ef6a6dc62 Translations for stock transaction notes 2021-01-29 12:23:22 +11:00
Oliver Walters
282ed0c637 Recompile translations 2021-01-29 12:05:47 +11:00
Oliver Walters
c1a54ddffd Expose bootstrap table strings to translation layer 2021-01-29 12:04:36 +11:00
Oliver Walters
62501ecb93 Hide main QR button if setting is disabled 2021-01-29 09:48:16 +11:00
Oliver
8c7621d4bc
Merge pull request #1260 from SchrodingersGat/barcode-scanner
Barcode scanner
2021-01-29 00:42:50 +11:00
Oliver Walters
fc193c26d0 Delete unused function 2021-01-28 22:43:41 +11:00
Oliver Walters
489a15704c Refactoring 2021-01-28 22:41:20 +11:00
Oliver Walters
ae15ce9d0a Update translations 2021-01-28 22:38:47 +11:00
Oliver Walters
e8d73c78eb Fixes for unit tests 2021-01-28 22:37:28 +11:00
Oliver Walters
c61631a380 Refactor tractor 2021-01-28 22:24:06 +11:00
Oliver Walters
5e5bced0c7 Optionally include javascript code based on barcode feature 2021-01-28 21:51:34 +11:00
Oliver Walters
4641123cd8 Allow multiple stock items to be checked into a location using table selection 2021-01-28 21:47:39 +11:00
Oliver Walters
d61ae8532a Dialog for checking multiple items into a stock location 2021-01-28 21:36:57 +11:00
Oliver Walters
7e8def15ed Hide barcode actions if barcode support is disabled 2021-01-28 20:45:42 +11:00
Oliver Walters
51a33e5dca Add setting to enable / disable barcode support
(Default = True)
2021-01-28 20:18:03 +11:00
Oliver
14d24ebe07
Merge pull request #1258 from SchrodingersGat/part-image-fix
Prevent part images from auto deleting
2021-01-28 00:18:44 +11:00
Oliver Walters
220777611a Prevent part images from auto deleting
- Part images can be used for multiple parts
2021-01-27 22:31:21 +11:00
Oliver Walters
6e2fb76ea2 Merge remote-tracking branch 'upstream/master' 2021-01-27 20:37:23 +11:00
Oliver Walters
5c9dd93ff1 More unit test fix 2021-01-22 12:22:29 +11:00
Oliver Walters
03f7baf87f Unit test fixes 2021-01-22 09:50:30 +11:00
Oliver Walters
2d412e2be1 Default to using "simple" QR codes 2021-01-21 20:55:13 +11:00
Oliver
b90311acea
Merge pull request #1250 from SchrodingersGat/url-col
Display link column in part table
2021-01-20 19:30:36 +11:00
Oliver Walters
69362ab960 Display link column in part table 2021-01-20 18:04:08 +11:00
Oliver
71522fa608
Merge pull request #1248 from SchrodingersGat/overdue-unit-test
Adds unit testing for order overdue status
2021-01-20 08:38:44 +11:00
Oliver Walters
82e6b87e1c Adds unit testing for order overdue status 2021-01-20 07:49:14 +11:00
Oliver
914fe15921
Merge pull request #1247 from Pervanovo/pr-fix-misspelled-query-filter
Fix misspelled query filter method name
2021-01-20 07:27:15 +11:00
Daniel Pervan
0d462389b9 Fix misspelled query filter method name 2021-01-19 12:00:30 +01:00
Oliver Walters
8cb6b7d8d4 Merge remote-tracking branch 'inventree/master' 2021-01-19 11:06:31 +11:00
Oliver
d17cb47e3c
Update version.py 2021-01-19 11:06:08 +11:00
Oliver
5c2012f873
Update version.py 2021-01-19 11:05:50 +11:00
Oliver
0517fe5073
Merge pull request #1243 from SchrodingersGat/report-filter-validation
Improve filter validation for test report
2021-01-19 11:05:24 +11:00
Oliver Walters
a6030d4cc8 Merge remote-tracking branch 'inventree/master' 2021-01-19 09:31:07 +11:00
Oliver Walters
59e37b2526 Improve filter validation for test report 2021-01-19 08:15:50 +11:00
Oliver
ce28b84f34
Merge pull request #1242 from SchrodingersGat/batch-reports
Batch reports
2021-01-18 23:48:19 +11:00
Oliver Walters
f81c154578 Update translation files 2021-01-18 23:25:11 +11:00
Oliver Walters
436207b315 Merge remote-tracking branch 'inventree/master' into batch-reports
# Conflicts:
#	InvenTree/templates/stock_table.html
2021-01-18 23:23:58 +11:00
Oliver
a5aa90cdf2
Merge pull request #1155 from eeintech/stock_owner
Stock Locations and Items Ownership
2021-01-18 22:55:26 +11:00
Oliver Walters
833ba8c472 Template fixes 2021-01-18 22:45:07 +11:00
Oliver Walters
526d81481b Cleanup 2021-01-18 22:25:53 +11:00
Oliver Walters
697a338700 Add a smattering of unit tests 2021-01-18 22:14:38 +11:00
Oliver Walters
6a7c722efc Stock table button cleanup 2021-01-18 21:52:20 +11:00
Oliver Walters
952da19600 Print test report for multiple stock items at once 2021-01-18 21:42:55 +11:00
Oliver Walters
0a566c062d Add click callback on item test tab 2021-01-18 21:36:37 +11:00