inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
4,321 Commits 9 Branches 164 Tags
98d291c2f8893c34f8703b8d952030d743d4e434
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 98d291c2f8 Add model rule for ReportSnippet 2021-02-04 19:26:43 +11:00
Oliver Walters 59904ace1d Revoke support for LaTex reporting 2021-02-04 16:18:28 +11:00
Oliver Walters 264bd625d3 Remove debug string 2021-02-04 16:13:03 +11:00
Oliver Walters 0de284f1aa Unit fixes 2021-02-04 16:06:01 +11:00
Oliver Walters 6ebebe03d4 Simplify report snippet class definition 2021-02-04 15:38:41 +11:00
Oliver Walters a025b7239d Adds simple test-report template 2021-02-04 15:29:46 +11:00
Oliver Walters ddbf2a6313 Add margin callouts for report template base 2021-02-04 14:49:11 +11:00
Oliver Walters cf0c43d899 Add report base template 2021-02-04 13:54:26 +11:00
Oliver Walters 6230fb3614 Add custom report template tags 2021-02-04 13:41:47 +11:00
Oliver Walters 801b945438 Add current date to report context 2021-02-04 13:33:14 +11:00
Oliver Walters 3ccc500e8e Add more context data to report 2021-02-04 12:58:19 +11:00
Oliver Walters cbadb2a888 Small refactor, and allow editing of ReportAsset in the admin interface 2021-02-03 21:54:11 +11:00
Oliver Walters 90bef69a59 Adds "report snippet" class allowing re-usable report snippets to be uploaded 2021-02-03 16:58:06 +11:00
OliverandGitHub 79ddea50f5 Merge pull request #1267 from SchrodingersGat/migration-fixes 
Migration fixes
 2021-02-03 14:48:21 +11:00
Oliver Walters 5e9097b5e0 PSQL: Upper-case column names *must* be qualified with double-quotes 
Ref: https://www.xspdf.com/resolution/53039249.html
 2021-02-03 13:16:32 +11:00
Oliver Walters 0e246a7fdf Migration fix (response is different for postgresql) 2021-02-03 13:02:28 +11:00
Oliver Walters 793e5b820e Remove all model references from migration file 2021-02-03 11:56:48 +11:00
Oliver Walters bc43d14ebf Change model functions to raw SQL 2021-02-03 11:28:43 +11:00
Oliver Walters f798537c73 Reverse migration company.0024 2021-02-03 09:52:59 +11:00
OliverandGitHub 65791a2b9b Merge pull request #1255 from SchrodingersGat/simple-qr-codes 
Default to using "simple" QR codes
 2021-02-01 13:37:42 +11:00
Oliver Walters 43e03ed023 Update unit tests 2021-02-01 12:26:58 +11:00
Oliver Walters 7d38507785 Merge remote-tracking branch 'inventree/master' into simple-qr-codes 2021-02-01 12:24:16 +11:00
OliverandGitHub 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
OliverandGitHub 27b8928a10 Merge pull request #1263 from SchrodingersGat/table-translations 
Table translations
 2021-01-30 09:48:47 +11:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub d17cb47e3c Update version.py 2021-01-19 11:06:08 +11:00
OliverandGitHub 5c2012f873 Update version.py 2021-01-19 11:05:50 +11:00
OliverandGitHub 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 59e37b2526 Improve filter validation for test report 2021-01-19 08:15:50 +11:00
OliverandGitHub 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
OliverandGitHub 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
Oliver Walters ef7cc3f78d Replace existing django form views with API request 2021-01-18 21:33:15 +11:00
Oliver Walters 1b835a71df Print one (or more!) report templates via API 2021-01-18 21:17:19 +11:00
Oliver Walters cbb286e46d Add API for stock item test report 2021-01-18 20:55:30 +11:00
OliverandGitHub 873ac9accb Merge pull request #1241 from SchrodingersGat/settings.py 
Allow more settings to be specified via environment variables
 2021-01-18 20:52:50 +11:00
Oliver Walters f7079c3bc2 Style fixes 2021-01-18 20:21:19 +11:00
Oliver Walters 3ae4125df3 Allow more settings to be specified via environment variables 2021-01-18 20:17:36 +11:00
OliverandGitHub 1d6bd2c6ca Merge pull request #1240 from SchrodingersGat/translation-stats 
Translation stats
 2021-01-18 20:08:20 +11:00
Oliver Walters c392bba196 Add script to calculate translation stats 2021-01-18 19:13:52 +11:00
Oliver Walters c517801c5f Update doc strings for translation scripts 2021-01-18 18:51:10 +11:00
OliverandGitHub 2277d225eb Merge pull request #1239 from SchrodingersGat/stock-serial-fix 
Stock serial fix
 2021-01-18 16:50:54 +11:00
Oliver Walters 2b30df1a70 Fix 2021-01-18 14:41:31 +11:00
Oliver Walters a7baad33ba Fix form error for creating a new stock item 2021-01-18 14:41:31 +11:00
OliverandGitHub 2991ce9317 Merge pull request #1236 from SchrodingersGat/js-fix 
Bug fix
 2021-01-17 19:58:35 +11:00
Oliver Walters 0dee4df8fb Bug fix 2021-01-15 17:11:46 +11:00
OliverandGitHub 69e6006436 Merge pull request #1235 from SchrodingersGat/stock-updated-filter 
Stock updated filter
 2021-01-15 17:08:21 +11:00
Oliver Walters 4952c95c33 Extra check to prevent JS crash 2021-01-15 16:51:34 +11:00
Oliver Walters fc32d99327 Add "updated_before" and "updated_after" filter for stock API 2021-01-15 16:39:50 +11:00
Oliver Walters ef3ac43c4a Add "last updated" date to stock table 2021-01-15 15:27:40 +11:00
OliverandGitHub 8f4ae14f2d Merge pull request #1233 from SchrodingersGat/limit-matches 
Limit matches to the 5 "most matchy" ones
 2021-01-15 12:55:39 +11:00
Oliver Walters 85bce24e30 Limit matches to the 5 "most matchy" ones 2021-01-15 12:32:27 +11:00
OliverandGitHub aada0ca5af Merge pull request #1212 from SchrodingersGat/label-api 
Label API
 2021-01-15 09:47:34 +11:00
Oliver Walters a70416abac Update translations 2021-01-15 00:04:31 +11:00
Oliver Walters 0134597747 Merge remote-tracking branch 'inventree/master' into label-api 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2021-01-14 23:56:23 +11:00
OliverandGitHub 449b462bf2 Merge pull request #1232 from SchrodingersGat/purchase-order-target-date 
Purchase order target date
 2021-01-14 23:26:58 +11:00
Oliver Walters 4fd0d7d8b5 Unit test fix 2021-01-14 23:06:49 +11:00
Oliver Walters 959914c78c Display overdue purchase orders in the calendar view 2021-01-14 22:19:32 +11:00
Oliver Walters fef5b7548e Increase unit testing for order API 2021-01-14 22:06:53 +11:00
OliverandGitHub af7af395f8 Merge pull request #1219 from rcludwick/secret_key 
Fixes #1215.  Allow secret key to come from file.
 2021-01-14 21:11:30 +11:00
Oliver Walters 02132fa495 Updated translation files 2021-01-14 17:55:00 +11:00
Oliver Walters 75e1442fce Display overdue purchase orders on the index page 2021-01-14 17:48:16 +11:00
Oliver Walters e8fd597f29 Adds ability to edit target_date in purchaseorder form 2021-01-14 17:44:21 +11:00
Oliver Walters 21e8ddd1e6 Display overdue status on PurcahseOrder page 2021-01-14 17:42:38 +11:00
Oliver Walters a8e6d0a89f Display overdue status in purchase order table 
- Allow table to be filtered by "overdue" status
 2021-01-14 17:37:10 +11:00
Oliver Walters 4d73aab090 Add "overdue" flag to serializer 
- Also allow filtering by overdue status in the API
 2021-01-14 17:33:24 +11:00