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
2,854 Commits 6 Branches 99 Tags 484 MiB
251a23d127
Commit Graph

2854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
a0e1645ca1
Update README.md 2020-05-12 22:13:50 +10:00
Oliver
c26d22e599
Merge pull request #802 from SchrodingersGat/attachment-user 
Attachment Improvements
 2020-05-12 22:10:44 +10:00
Oliver Walters
f5b97da5d2 Refactor "attachment" table into template 2020-05-12 22:05:38 +10:00
Oliver Walters
366d4b2143 Add new attechment functionality to new models 
- Giving the ol' refactor tractor a fresh coat of paint
 2020-05-12 21:40:42 +10:00
Oliver Walters
2369b40bbf Ensure user gets saved when uploading attachment via API 2020-05-12 21:11:38 +10:00
Oliver Walters
5d716d0cdd Add "upload date" field to fileattachment base class 2020-05-12 20:57:41 +10:00
Oliver Walters
d4fa7d936e Add 'user' field to attachment 2020-05-12 20:50:03 +10:00
Oliver
2948dad831
Merge pull request #800 from SchrodingersGat/stock-api 
Stock api
 2020-05-12 20:26:30 +10:00
Oliver Walters
0851a925fb Add ability to filter by whether the part is serialized or not 2020-05-12 20:18:28 +10:00
Oliver Walters
4615fbc0d8 Abillty to filter stock list by serial number 2020-05-12 20:15:37 +10:00
Oliver
c371a9a8e8
Merge pull request #799 from SchrodingersGat/stock-track-api 
Stock track api
 2020-05-12 08:49:18 +10:00
Oliver Walters
b9d0c60189 Pepper 2020-05-12 08:12:42 +10:00
Oliver Walters
c6cff1fb2e Fixes for StockItem tracking API 
- Make the tracking API consistent with other API endpoints
 2020-05-12 08:12:12 +10:00
Oliver
18fbe2d2dd
Merge pull request #798 from SchrodingersGat/transa 
Typo fix
 2020-05-12 07:11:20 +10:00
Oliver Walters
ac5e26ca0e Typo fix 2020-05-12 07:07:29 +10:00
Oliver
d2a7961895
Merge pull request #795 from SchrodingersGat/attachment-api 
Attachment api
 2020-05-12 00:10:13 +10:00
Oliver
65fe6bfaca
Merge pull request #796 from SchrodingersGat/newer-icon 
Newer icon
 2020-05-12 00:09:42 +10:00
Oliver Walters
3151612962 PEP fix 2020-05-12 00:07:08 +10:00
Oliver Walters
693af04c11 Export large version of the logo 2020-05-12 00:06:26 +10:00
Oliver Walters
4b1d96faad Icon tweaks 2020-05-12 00:01:56 +10:00
Oliver Walters
645e5b6449 Add "larger" version of the icon 2020-05-11 23:58:35 +10:00
Oliver Walters
99af98c5a7 Update iconset 2020-05-11 23:58:27 +10:00
Oliver Walters
cfc0145180 Add some unit tests 2020-05-11 23:44:22 +10:00
Oliver Walters
a7e5a79f4c Expose salesorder and purchaseorder attachments to the API 2020-05-11 23:41:57 +10:00
Oliver Walters
17d0a015f2 Add API endpoint for StockItem attachment items 2020-05-11 23:32:40 +10:00
Oliver Walters
f36c5137dd Add ability to add part file attachments via the API 2020-05-11 23:25:55 +10:00
Oliver
f71bfb5700
Update version.py 2020-05-07 10:08:37 +10:00
Oliver
00ccfdf11b
Update version.py 2020-05-07 10:08:20 +10:00
Oliver
5747a07f7b
Merge pull request #792 from SchrodingersGat/stock-item-attachment 
Stock item attachment
 2020-05-07 10:07:31 +10:00
Oliver Walters
003b384abd Slight adjustment to page tabs for StockItem view 2020-05-07 10:04:16 +10:00
Oliver Walters
ea0d32fd3d PEP fixes 2020-05-07 09:58:29 +10:00
Oliver Walters
14132a6efa Add views / models / etc etc to support StockItem attachment 2020-05-07 09:57:54 +10:00
Oliver Walters
64f6238351 Add StockItemAttachment model 2020-05-07 09:39:28 +10:00
Oliver
e83a0610af
Merge pull request #790 from SchrodingersGat/secondary-dialog 
Add "new manufacturer" button
 2020-05-04 20:05:10 +10:00
Oliver Walters
6318b0bddf Hide a silly button which does nothing 2020-05-04 19:51:06 +10:00
Oliver Walters
0933cf859c Add "new manufacturer" button 2020-05-04 19:48:09 +10:00
Oliver
7afb2a6a75
Merge pull request #786 from SchrodingersGat/stats-fix 
Table colspan fix
 2020-05-04 10:01:05 +10:00
Oliver Walters
ec3e02af94 Table colspan fix 2020-05-04 09:52:50 +10:00
Oliver
9823c3c81b
Merge pull request #785 from SchrodingersGat/bug-icon 
Update icon
 2020-05-04 09:46:19 +10:00
Oliver Walters
ce610490b6 Update icon 
- Simple test to see if the travis integration is working correctly now
 2020-05-04 09:43:09 +10:00
Oliver
78cc3a9cf3
Merge pull request #783 from SchrodingersGat/redirect-tweaks 
Redirect tweaks
 2020-05-04 08:58:35 +10:00
Oliver Walters
436fb3bf30 PEP fixes 2020-05-04 08:54:16 +10:00
Oliver Walters
2c44104c9c Small tweak for login redirect 2020-05-04 08:53:47 +10:00
Oliver
461d694cf8
Merge pull request #782 from andyseracuse/redirect-after-login 
after a login redirect and a successful login, the user is now redirected to the originally desired url
 2020-05-04 08:49:13 +10:00
Oliver
779c1e1d58
Merge pull request #780 from SchrodingersGat/rejected-stock 
Rejected stock
 2020-05-04 08:41:34 +10:00
Oliver Walters
5a100962fe Merge remote-tracking branch 'inventree/master' into rejected-stock 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-05-04 08:10:14 +10:00
Oliver
c505080527
Merge pull request #781 from chschlue/updloc2 
Update de translation
 2020-05-04 08:07:37 +10:00
Oliver Walters
53149ab4dc Merge remote-tracking branch 'inventree/master' into rejected-stock 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
 2020-05-04 08:06:50 +10:00
Andy Seracuse
85c948ef67 made changed middleware and made necessary changes to settings and urls fles so that the user is redirected to their desired page after a login redirect unless the desired page was logout, in which case the user will be redirect 2020-05-03 14:11:57 -06:00
Christian Schlüter
0a5a1ec5fd
Update de translation 2020-05-03 11:37:51 +02:00