inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 20:46:08 +00:00
Code Activity
4,268 Commits 9 Branches 164 Tags
d17cb47e3cfa5f3e748872db66feb2fb6dcb23fd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 834d9ec9a1 Add "target_date" field to PurchaseOrder 2021-01-14 17:28:57 +11:00
OliverandGitHub 9efde9de29 Merge pull request #1231 from SchrodingersGat/slow-bom-fix 
Add option to show part quantity in various forms
 2021-01-14 15:35:39 +11:00
Oliver Walters 1dc2636e45 Add option to show part quantity in various forms 
Enabling this option can make BOM item forms *very* slow!
 2021-01-14 15:20:42 +11:00
OliverandGitHub 8d6b4a2fd3 Merge pull request #1229 from SchrodingersGat/cancel-order-fix 
Bug fix for cancelling purchase orders
 2021-01-14 15:03:36 +11:00
Oliver Walters be41741b1e Bug fix for cancelling purchase orders 2021-01-14 14:37:49 +11:00
OliverandGitHub 76c938762c Merge pull request #1228 from SchrodingersGat/stock-status-ste 
Stock status ste
 2021-01-14 14:24:47 +11:00
OliverandGitHub 3ec57a7259 Merge pull request #1226 from SchrodingersGat/can-build 
Add "Can Build" column in BOM view
 2021-01-14 14:04:43 +11:00
Oliver Walters bb9fe98a7e Set status for multiple stock items at once 2021-01-14 14:04:24 +11:00
Oliver Walters aac835f634 Add menu item to set stock status for multiple items 2021-01-14 13:41:38 +11:00
Oliver Walters d459947949 Add "Can Build" column in BOM view 2021-01-14 13:34:51 +11:00
OliverandGitHub a2f9d721f3 Merge pull request #1222 from SchrodingersGat/bom-upload-fix 
Fix IPN comparison against null value
 2021-01-14 13:17:23 +11:00
Oliver Walters 1cb951bd0b Fix for font-awesome icon 2021-01-14 12:08:54 +11:00
Oliver Walters df327d4e64 Add stocktake_date field to stock API, and to stock table 2021-01-14 11:29:35 +11:00
Oliver Walters 1316e6bf5b Properly save user data when creating a new StockItem 2021-01-14 11:24:52 +11:00
Oliver Walters 890ce9ef95 Fix IPN comparison against null value 2021-01-14 10:58:29 +11:00
Oliver Walters df335b683c Add #TODO 2021-01-14 10:54:34 +11:00
OliverandGitHub e4b202edd8 Merge pull request #1221 from eeintech/new_rule_sets 
Separated category from part permissions and location from stock item permissions
 2021-01-14 08:38:44 +11:00
Oliver Walters b7bbc97218 Add unit test 2021-01-14 08:32:37 +11:00
Oliver Walters 9884fe5c5e Improve validators for 'filters' field 2021-01-14 08:15:05 +11:00
Oliver Walters 88a7b3251d Remove unused import 2021-01-14 08:14:32 +11:00
Oliver Walters 6e4cf7c092 Catch db integrity errors 2021-01-13 22:07:30 +11:00
Oliver Walters 80c88b4fcc Update translations 2021-01-13 21:53:11 +11:00
Oliver Walters 4e2d3b7da2 Improvement for existing StockItemLabel template 2021-01-13 21:52:16 +11:00
Oliver Walters e561b3a4fc Add StockItemLabel templates 2021-01-13 21:51:55 +11:00
OliverandGitHub eedd8059d8 Merge pull request #1217 from eeintech/bom_item_delete 
Allow user with part.change permission to delete BOM items, part attachments and parameters
 2021-01-13 10:16:25 +11:00
Oliver Walters 01e27a0d59 Add simplified 'barcode' function for StockItem 2021-01-12 00:22:58 +11:00
Oliver Walters 663a0a6165 Create simple label templates for stocklocation labels 2021-01-11 23:45:25 +11:00
Oliver Walters d1d243fb14 Update label models 2021-01-11 23:44:11 +11:00
Oliver Walters b6cd2c215a Adds function to provide simplified barcode for stock location 2021-01-11 21:32:31 +11:00
Oliver Walters 1368b06afa PEP fix 2021-01-11 19:46:17 +11:00
Oliver Walters d91700fd39 StockLocation labels are now printable 2021-01-11 18:41:57 +11:00
Oliver Walters af47b211fd Add dialog for selection of stock location labels 2021-01-11 17:22:04 +11:00
Oliver Walters 79b63e6d30 Update translation 2021-01-09 22:23:51 +11:00
Oliver Walters a3c5ea1f2b Typo fix 2021-01-09 22:02:33 +11:00
Oliver Walters 21d5440f98 Remove unused views 2021-01-09 21:55:05 +11:00
Oliver Walters e133fff03e Download PDF for labels 2021-01-09 21:50:42 +11:00
Oliver Walters bdc7367e29 Add endpoint for printing labels 2021-01-09 20:43:48 +11:00
Oliver Walters 44e60a705e Add detail endpoints for the StockItemLabel and StockLocationLabel models 2021-01-09 08:20:29 +11:00
Oliver Walters a0d1f95171 Add exception for new database table 2021-01-09 08:10:04 +11:00
Oliver Walters 7c7a67fcc6 Add filterable API for StockLocation labels 2021-01-08 23:08:30 +11:00
Oliver Walters f0fa092c66 Add model for StockLocation label 2021-01-08 23:08:00 +11:00
Oliver Walters 80c7ee6dab Add ability to filter label by StockItem 2021-01-08 22:47:47 +11:00
Oliver Walters 446c744462 Expose stock items labels to the API 2021-01-08 22:19:52 +11:00
OliverandGitHub ab9a6bd3c4 Merge pull request #1211 from SchrodingersGat/attachment-api 
Filter PartAttachment API list by Part reference
 2021-01-08 12:22:59 +11:00
Oliver Walters 59bb5d15c8 Filter PartAttachment API list by Part reference 2021-01-08 08:43:00 +11:00
OliverandGitHub 5666db6b7a Merge pull request #1208 from SchrodingersGat/calendar 
Add fullcalendar javascript library
 2021-01-08 00:04:16 +11:00
Oliver Walters 75f31ecc63 Update translations 2021-01-07 23:50:34 +11:00
Oliver Walters 47b0f40e97 Calendar view for build orders 2021-01-07 23:41:54 +11:00
Oliver Walters 76c86e7b2f Calendar view for purchase orders 2021-01-07 23:04:00 +11:00
Oliver Walters 38b6367453 PEP fixes 2021-01-07 22:34:17 +11:00
Oliver Walters b7203f0ebb Switch between calendar and list view for sales orders 2021-01-07 22:32:17 +11:00
Oliver Walters 5f6442ba6b Render sales orders to a calendar view 2021-01-07 18:47:29 +11:00