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
4,616 Commits 6 Branches 99 Tags 484 MiB
9eba3f42e0
Commit Graph

4616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Oliver
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
Oliver
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
Oliver
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
Oliver Walters
5ce0e15015 Merge remote-tracking branch 'inventree/master' 2021-01-18 11:12:26 +11:00
eeintech
72c7ceb553 Merged master and updated stock_table.html 2021-01-17 13:11:59 -05:00
Oliver
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
Oliver
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
Oliver
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
Oliver Walters
05cfb1a3ab Merge remote-tracking branch 'inventree/master' 2021-01-15 09:58:02 +11:00
Oliver
aada0ca5af
Merge pull request #1212 from SchrodingersGat/label-api 
Label API
 2021-01-15 09:47:34 +11:00
eeintech
7d5571ba5b Merged changes from master 2021-01-14 08:52:56 -05: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
Oliver
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
Oliver
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
Rob Ludwick
3cfe358102 Fixes #1215. Allow secret key to come from file. 2021-01-14 01:02:34 -07:00
Oliver Walters
02132fa495 Updated translation files 2021-01-14 17:55:00 +11:00