inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-30 20:55:42 +00:00
Code Activity
14,299 Commits 6 Branches 132 Tags
bae1c239e8f491ca4b4b1715c68dde4bc20b1381
Commit Graph

14299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
a13e50445e Merge branch 'tweeeek' 2019-06-03 14:19:21 +10:00
Oliver
aff4124d97 Merge pull request #382 from SchrodingersGat/tweeeek 
Remove defunct 'roadmap' document
 2019-06-03 14:18:33 +10:00
Oliver Walters
151731c376 Remove defunct 'roadmap' document 2019-06-03 13:54:33 +10:00
Oliver Walters
c00b19bc5b Merge remote-tracking branch 'inventree/master' 2019-06-02 20:42:37 +10:00
Oliver
efaf38c583 Merge pull request #381 from SchrodingersGat/assorted-fixes 
Assorted fixes
 2019-06-02 20:42:11 +10:00
Oliver Walters
219c438b82 Part name uniqueness is case insensitive 2019-06-02 20:37:59 +10:00
Oliver Walters
64d541f453 Hide result types which return no results 2019-06-02 20:28:17 +10:00
Oliver Walters
0b88953706 Form field rearrangement 2019-06-02 20:07:30 +10:00
Oliver Walters
ba26acd487 Rename some fields 
- Oops didn't think that through, gotta go through and fix the data now...
 2019-06-02 19:46:30 +10:00
Oliver Walters
fd2e2a71f9 Add search results for part-category and stock-location 2019-06-02 19:15:05 +10:00
Oliver Walters
3427f81a34 Improve part information display 
- Better terminology
 2019-06-02 14:47:40 +10:00
Oliver Walters
6e7f354a23 Add a 'LOST' status code for stockitem 2019-06-02 13:53:54 +10:00
Oliver Walters
013a85e6f7 Better dispaly of stock status 
- Send status text in JSON
- Only display status if it is not "OK"
 2019-06-02 13:53:11 +10:00
Oliver Walters
9577e4e505 Merge remote-tracking branch 'inventree/master' 
# Conflicts:
#	InvenTree/static/script/inventree/stock.js
#	InvenTree/stock/forms.py
#	InvenTree/stock/urls.py
#	InvenTree/stock/views.py
 2019-06-02 12:51:56 +10:00
Oliver
82f3773aa1 Merge pull request #380 from SchrodingersGat/server-side-stock-forms 
Server side stock forms
 2019-06-02 12:50:41 +10:00
Oliver Walters
6982b2f0c2 Making PEP happy 2019-06-02 12:47:40 +10:00
Oliver Walters
802ff35cf3 Remove some now unused forms / views / etc 2019-06-02 12:45:44 +10:00
Oliver Walters
5177b7f836 Remove some defunct javascript 2019-06-02 12:24:40 +10:00
Oliver Walters
2ee35ec062 Stock counting now works 2019-06-02 12:20:26 +10:00
Oliver Walters
d365d7cc44 remove from stock now works 2019-06-02 12:15:44 +10:00
Oliver Walters
1b3ffada6d Add-stock is now working 2019-06-02 12:13:22 +10:00
Oliver Walters
8dd9034563 Remove 'destination' field if we are not moving stock 
- Allow different stock adjustment actions
 2019-06-02 12:00:39 +10:00
Oliver Walters
d1ff115f74 Simplifiy js and improve template / form 2019-06-02 11:47:21 +10:00
Oliver Walters
c7503b4f9f Consolidated form/view into single 'stock-adjust' endpoint 2019-06-02 11:37:04 +10:00
Oliver Walters
fe31205017 Stock movement now works! 2019-06-02 11:27:03 +10:00
Oliver Walters
0b54baf6db POST the stock adjustment method back as a hidden form input 2019-06-02 11:15:12 +10:00
Oliver Walters
1b7762470d catch a ValueError 2019-06-02 11:14:56 +10:00
Oliver Walters
96f6f6068e Return message on succses 2019-06-02 11:05:40 +10:00
Oliver Walters
20963f83d9 Better error reporting for quantity 2019-06-02 11:00:28 +10:00
Oliver Walters
c228a4998c Extract stock items from POST and return to form 2019-06-02 10:25:19 +10:00
Oliver Walters
e278bdbb90 Improve filtering for stock items 2019-06-02 09:14:45 +10:00
Oliver Walters
011f5a5efd Delete rows interactively from stock adjustment form 2019-06-01 22:04:03 +10:00
Oliver Walters
6a04c8cbd3 Update stock_move form template 2019-06-01 21:16:59 +10:00
Oliver Walters
8214aef0db Add template for hover_image 2019-06-01 21:13:51 +10:00
Oliver Walters
3869bc27c9 Whoops, that form was being used. 
Created a copy of the form for multiple-item-stock-movements
 2019-05-30 09:01:16 +10:00
Oliver Walters
56821abd09 CSS tweaks for modals 2019-05-29 23:13:26 +10:00
Oliver Walters
d321947026 Add stock item fields for each item passed to the form 2019-05-29 22:38:42 +10:00
Oliver Walters
0e3f74ef31 Pass list of selected stock items to the view 2019-05-29 22:24:22 +10:00
Oliver Walters
0ce6c5f7d5 Redirect non-ajax forms to / 2019-05-29 22:24:17 +10:00
Oliver Walters
2b4cb4d3e0 Beginning to move the stocktake forms server side 2019-05-29 22:24:11 +10:00
Oliver Walters
72dc75512b Pass list of selected stock items to the view 2019-05-29 22:23:45 +10:00
Oliver Walters
f4a052ee2b Redirect non-ajax forms to / 2019-05-29 22:11:03 +10:00
Oliver Walters
080f9da9c8 Beginning to move the stocktake forms server side 2019-05-29 22:05:13 +10:00
Oliver Walters
1c1cc670f8 Merge remote-tracking branch 'inventree/master' 2019-05-29 01:06:27 +10:00
Oliver
da4f68e5a5 Merge pull request #375 from SchrodingersGat/group-stock-items 
Group stock items
 2019-05-29 01:05:57 +10:00
Oliver Walters
6a30485a4e Initial work toward fixing stock issues 2019-05-29 01:03:21 +10:00
Oliver Walters
d512232aac Readable css 2019-05-29 00:54:00 +10:00
Oliver Walters
ea03205c50 Don't need to detach and re-attach rows any more!! 2019-05-29 00:47:36 +10:00
Oliver Walters
2ccb014d9e FINALLY sorting is working well 
- Wrote a custom sorter which takes group rows into account
 2019-05-29 00:45:35 +10:00
Oliver Walters
ecde201bb0 Update to newest bootstrap-table script 2019-05-29 00:20:01 +10:00