2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-12 01:55:39 +00:00
Commit Graph

7483 Commits

Author SHA1 Message Date
4952c95c33 Extra check to prevent JS crash 2021-01-15 16:51:34 +11:00
fc32d99327 Add "updated_before" and "updated_after" filter for stock API 2021-01-15 16:39:50 +11:00
ef3ac43c4a Add "last updated" date to stock table 2021-01-15 15:27:40 +11:00
8f4ae14f2d Merge pull request from SchrodingersGat/limit-matches
Limit matches to the 5 "most matchy" ones
2021-01-15 12:55:39 +11:00
85bce24e30 Limit matches to the 5 "most matchy" ones 2021-01-15 12:32:27 +11:00
05cfb1a3ab Merge remote-tracking branch 'inventree/master' 2021-01-15 09:58:02 +11:00
aada0ca5af Merge pull request from SchrodingersGat/label-api
Label API
2021-01-15 09:47:34 +11:00
7d5571ba5b Merged changes from master 2021-01-14 08:52:56 -05:00
a70416abac Update translations 2021-01-15 00:04:31 +11:00
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
449b462bf2 Merge pull request from SchrodingersGat/purchase-order-target-date
Purchase order target date
2021-01-14 23:26:58 +11:00
4fd0d7d8b5 Unit test fix 2021-01-14 23:06:49 +11:00
959914c78c Display overdue purchase orders in the calendar view 2021-01-14 22:19:32 +11:00
fef5b7548e Increase unit testing for order API 2021-01-14 22:06:53 +11:00
af7af395f8 Merge pull request from rcludwick/secret_key
Fixes .  Allow secret key to come from file.
2021-01-14 21:11:30 +11:00
3cfe358102 Fixes . Allow secret key to come from file. 2021-01-14 01:02:34 -07:00
02132fa495 Updated translation files 2021-01-14 17:55:00 +11:00
75e1442fce Display overdue purchase orders on the index page 2021-01-14 17:48:16 +11:00
e8fd597f29 Adds ability to edit target_date in purchaseorder form 2021-01-14 17:44:21 +11:00
21e8ddd1e6 Display overdue status on PurcahseOrder page 2021-01-14 17:42:38 +11:00
a8e6d0a89f Display overdue status in purchase order table
- Allow table to be filtered by "overdue" status
2021-01-14 17:37:10 +11:00
4d73aab090 Add "overdue" flag to serializer
- Also allow filtering by overdue status in the API
2021-01-14 17:33:24 +11:00
834d9ec9a1 Add "target_date" field to PurchaseOrder 2021-01-14 17:28:57 +11:00
9efde9de29 Merge pull request from SchrodingersGat/slow-bom-fix
Add option to show part quantity in various forms
2021-01-14 15:35:39 +11:00
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
8d6b4a2fd3 Merge pull request from SchrodingersGat/cancel-order-fix
Bug fix for cancelling purchase orders
2021-01-14 15:03:36 +11:00
be41741b1e Bug fix for cancelling purchase orders 2021-01-14 14:37:49 +11:00
758ca0d17a Merge remote-tracking branch 'inventree/master' 2021-01-14 14:25:28 +11:00
76c938762c Merge pull request from SchrodingersGat/stock-status-ste
Stock status ste
2021-01-14 14:24:47 +11:00
3ec57a7259 Merge pull request from SchrodingersGat/can-build
Add "Can Build" column in BOM view
2021-01-14 14:04:43 +11:00
bb9fe98a7e Set status for multiple stock items at once 2021-01-14 14:04:24 +11:00
aac835f634 Add menu item to set stock status for multiple items 2021-01-14 13:41:38 +11:00
d459947949 Add "Can Build" column in BOM view 2021-01-14 13:34:51 +11:00
a2f9d721f3 Merge pull request from SchrodingersGat/bom-upload-fix
Fix IPN comparison against null value
2021-01-14 13:17:23 +11:00
1cb951bd0b Fix for font-awesome icon 2021-01-14 12:08:54 +11:00
df327d4e64 Add stocktake_date field to stock API, and to stock table 2021-01-14 11:29:35 +11:00
1316e6bf5b Properly save user data when creating a new StockItem 2021-01-14 11:24:52 +11:00
890ce9ef95 Fix IPN comparison against null value 2021-01-14 10:58:29 +11:00
df335b683c Add #TODO 2021-01-14 10:54:34 +11:00
c5778b6fb6 Added missing migration file (how did it escape?) 2021-01-13 17:33:55 -05:00
e92e5dfe8f Merged master 2021-01-13 17:08:01 -05:00
e4b202edd8 Merge pull request from eeintech/new_rule_sets
Separated category from part permissions and location from stock item permissions
2021-01-14 08:38:44 +11:00
b7bbc97218 Add unit test 2021-01-14 08:32:37 +11:00
9884fe5c5e Improve validators for 'filters' field 2021-01-14 08:15:05 +11:00
88a7b3251d Remove unused import 2021-01-14 08:14:32 +11:00
af1abb7129 Added missing migration file 2021-01-13 14:57:16 -05:00
59c0a50289 Separated category from part permissions and location from stock item permissions 2021-01-13 13:35:49 -05:00
28fb1b5fab Added owner model to admin page and added test cases 2021-01-13 11:38:37 -05:00
6e4cf7c092 Catch db integrity errors 2021-01-13 22:07:30 +11:00
80c88b4fcc Update translations 2021-01-13 21:53:11 +11:00