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
2,791 Commits 9 Branches 164 Tags
f39f5e5825b4cdbbf174adf9ddef4dbb032ceddf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters f39f5e5825 Add StockItemTestResult model 2020-05-16 19:56:18 +10:00
OliverandGitHub e550831efa Merge pull request #810 from SchrodingersGat/serial-auto-fill 
Serial auto fill
 2020-05-16 19:30:18 +10:00
Oliver Walters 8a99062704 PEP fixes 2020-05-16 17:52:25 +10:00
Oliver Walters a6ad263ee7 Fix clean functions so unit tests pass 2020-05-16 17:43:32 +10:00
Oliver Walters 40735d66a1 Translation tweaks 2020-05-16 17:32:20 +10:00
Oliver Walters 7190a8ef69 Serial number placeholder text for BuildComplete form 2020-05-16 17:29:41 +10:00
Oliver Walters 6552d011a4 Better calculatation of placeholder text for serial number 2020-05-16 16:42:34 +10:00
Oliver Walters 3df8f33080 Logic fixes for CreateStockItem form 
- Improved data validation
- Fix bug where form was not checked for validity
 2020-05-16 12:04:53 +10:00
Oliver Walters 3d0bea15ae Refactor function naming 2020-05-16 12:03:18 +10:00
Oliver Walters 4cb97b1340 Add some more form candy 2020-05-16 11:55:10 +10:00
Oliver Walters 498ad4162c Bugfix: Turns out 'prefix' and 'suffix' were protected fields! 2020-05-16 11:05:45 +10:00
Oliver Walters 08d177e55f Update refactor for editing PO and SO forms 2020-05-16 09:36:43 +10:00
Oliver Walters 8fae32e3c7 Refactor HelperForm to easily allow setting prepended text / placeholder / etc 2020-05-16 09:33:34 +10:00
Oliver Walters 0ccac09962 Auto-fill serial numbers for the SerializeStock form 2020-05-16 09:06:39 +10:00
Oliver Walters 10762fc1cf Refactor tractor 2020-05-16 08:55:19 +10:00
Oliver Walters ea88a03b5a More serial number validation and unit testing 
-
 2020-05-16 08:43:57 +10:00
Oliver Walters 2d6c531fda Unit testing for part variant MPTT 2020-05-15 22:01:21 +10:00
Oliver Walters 0652579312 Update fixture for part model to match MPTT requirements 2020-05-15 21:44:25 +10:00
Oliver Walters 0a78432a0f Convert 'part" to MPTT model - based on the 'variant_of' field 
- Now recursive variants can be implemented properly
 2020-05-15 21:35:53 +10:00
Oliver Walters 72cfaccac5 Pass StockItem object through to the SerializeStock form 2020-05-15 21:16:00 +10:00
OliverandGitHub 5b5b848a98 Merge pull request #805 from SchrodingersGat/form-candy 
Form candy
 2020-05-14 21:56:55 +10:00
Oliver Walters 0f00205256 PEP fix 2020-05-14 21:52:39 +10:00
Oliver Walters 007d2d4054 Add prepended text to order references for forms 2020-05-14 21:51:44 +10:00
Oliver Walters 16aa18429a Use bootstrap3 styling for django crispy forms 2020-05-14 16:55:33 +10:00
OliverandGitHub cf9891398a Merge pull request #804 from SchrodingersGat/order-auto-increment 
Order auto increment
 2020-05-14 15:36:05 +10:00
Oliver Walters 5167f54268 Fix unit tests 2020-05-14 15:20:40 +10:00
Oliver Walters 6175c5408c Javascript indent cleanup 2020-05-14 15:10:48 +10:00
Oliver Walters d3758981b4 Fix "New Sales Order" button in Customer detail view 2020-05-14 15:09:31 +10:00
Oliver Walters b619f26074 Auto-increment sales order reference number 2020-05-14 15:05:55 +10:00
Oliver Walters 08903f357e Auto-increment the purchase-order number when creating a new one 2020-05-14 15:02:46 +10:00
Oliver Walters cebfe9a30f Function to predict the next purchase order number 2020-05-14 15:00:00 +10:00
Oliver Walters 41eff97c7c Add function to "increment" a number or a number-like string 
- Observe string width
- Keep prefix if one exists
 2020-05-14 14:59:49 +10:00
OliverandGitHub 65f081d252 Merge pull request #803 from SchrodingersGat/attachment-drag-and-drop 
Attachment drag and drop
 2020-05-13 11:38:18 +10:00
Oliver Walters 30b5f7d507 Drag and drop for order attachments 2020-05-13 11:28:45 +10:00
Oliver Walters 7143c32fc9 Drag-and-drop attachments for stock item 2020-05-13 11:22:57 +10:00
Oliver Walters db01f3646a Enable drag-and-drop attachment upload for Part 2020-05-13 11:13:26 +10:00
Oliver Walters cedf9a9108 Attachment comment field is optional 2020-05-13 10:16:26 +10:00
OliverandGitHub a0e1645ca1 Update README.md 2020-05-12 22:13:50 +10:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub d2a7961895 Merge pull request #795 from SchrodingersGat/attachment-api 
Attachment api
 2020-05-12 00:10:13 +10:00
OliverandGitHub 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
OliverandGitHub f71bfb5700 Update version.py 2020-05-07 10:08:37 +10:00
OliverandGitHub 00ccfdf11b Update version.py 2020-05-07 10:08:20 +10:00
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
OliverandGitHub 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
Oliver Walters 54c903f637 translation updates 2020-05-03 09:51:59 +10:00
Oliver Walters 7430abc237 Add ability to set stock status when receiving goods 2020-05-03 09:50:00 +10:00
Oliver Walters fe87bba577 Link fix for purchase order table 2020-05-03 09:46:42 +10:00
OliverandGitHub ca1b9e6403 Merge pull request #778 from SchrodingersGat/dynamic-js 
Update translations
 2020-05-03 09:29:34 +10:00
Oliver Walters 29335fa665 Add "rejected" status code for StockItem 2020-05-03 09:09:17 +10:00
OliverandGitHub 45fc8ce6bd Merge pull request #779 from SchrodingersGat/translation-helper 
Translation helper
 2020-05-03 09:03:06 +10:00
Oliver Walters 275cd063e1 PEP fixes 2020-05-03 08:59:44 +10:00
Oliver Walters 88e28edba9 Script now manually adjusts the translation file 2020-05-02 23:10:18 +10:00
Oliver Walters 979cf10c66 First pass at a translation helper script 2020-05-02 22:52:32 +10:00
Oliver Walters 034f70c491 Update translations 2020-05-02 22:39:56 +10:00
OliverandGitHub 9ee9664e65 Merge pull request #777 from SchrodingersGat/dynamic-js 
Fix stock thing
 2020-05-02 22:22:28 +10:00
Oliver Walters d59f22febb Fix stock thing 2020-05-02 22:18:08 +10:00
OliverandGitHub 1a4f5cf719 Merge pull request #776 from SchrodingersGat/dynamic-js 
Add endpoint for dynamic javascript files
 2020-05-02 22:16:35 +10:00
Oliver Walters af6dd83f05 Rename .js files to .html 
This is required so they are parsed by the translation engine
 2020-05-02 22:13:14 +10:00
Oliver Walters 314b8fdbff regenerate translation files 2020-05-02 22:08:25 +10:00