2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 12:33:33 +00:00
Commit Graph

17644 Commits

Author SHA1 Message Date
matmair 50356afd41 Merge branch 'master' of https://github.com/inventree/InvenTree into homepage-settings 2021-07-23 00:03:21 +02:00
matmair 7abf70fdd7 style fix 2021-07-22 23:53:17 +02:00
matmair 3b12b0231e fixing wired unique behaviour 2021-07-22 23:50:51 +02:00
matmair 5f2bef7ee1 base implementation of user setting 2021-07-22 23:50:09 +02:00
matmair 3f6c7df7a8 change template setting behaviour for user setting 2021-07-22 23:48:28 +02:00
matmair e287860e10 admin for user setting 2021-07-22 23:46:31 +02:00
matmair 449fc329c9 usersetting edit url 2021-07-22 23:45:34 +02:00
matmair 7ef87320a0 abstract edit 2021-07-22 23:44:25 +02:00
matmair 6f5fc528b7 override functions 2021-07-22 23:43:51 +02:00
matmair 8f374e255e abstract filters and refactor 2021-07-22 23:43:03 +02:00
matmair 69ff0ac248 ruleset 2021-07-22 23:39:36 +02:00
matmair c0d6ef80fc unique model settings 2021-07-22 23:39:19 +02:00
eeintech 3f44233074 Improve import 2021-07-22 16:41:45 -04:00
eeintech d7028b6d74 Make it generic method instead 2021-07-22 16:34:35 -04:00
eeintech 9b542ed23f Run exchange rate updated as task if worker cluster is running 2021-07-22 15:55:17 -04:00
Oliver 2d39a9f5ce Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-07-22 10:20:33 +10:00
Oliver 85f0bd2988 Fix: New translations django.po from Crowdin 2021-07-22 07:30:38 +10:00
Oliver bf2717e8fc Fix: New translations django.po from Crowdin 2021-07-21 22:53:26 +10:00
Oliver 85782053f1 Fix: New translations django.po from Crowdin 2021-07-21 22:53:25 +10:00
Oliver aa18f6c7db Fix: New translations django.po from Crowdin 2021-07-21 22:53:23 +10:00
Oliver 72c9c94bf0 Fix: New translations django.po from Crowdin 2021-07-21 22:53:22 +10:00
Oliver 720a9ccd8b Fix: New translations django.po from Crowdin 2021-07-21 22:53:20 +10:00
Oliver 552b2d0c2e Fix: New translations django.po from Crowdin 2021-07-21 22:53:19 +10:00
Oliver e1adf8f237 Fix: New translations django.po from Crowdin 2021-07-21 22:53:18 +10:00
Oliver d7f63db1c3 Fix: New translations django.po from Crowdin 2021-07-21 22:53:16 +10:00
Oliver 7dca582cc1 Fix: New translations django.po from Crowdin 2021-07-21 22:53:15 +10:00
github-actions[bot] d34bec294e updated translation base 2021-07-21 12:35:29 +00:00
Oliver 2bf7b61668 Merge pull request #1857 from SchrodingersGat/part-parameters-in-reports
Part parameters in reports
2021-07-21 22:33:39 +10:00
Oliver 964672d6cc Add parameters to template 2021-07-21 22:14:03 +10:00
Oliver afde997cf9 Expose part parameters to Part label templates 2021-07-21 22:05:52 +10:00
Oliver b4e7995687 Fix: New translations django.po from Crowdin 2021-07-21 21:56:47 +10:00
Oliver fa68c4bb8c Fix: New translations django.po from Crowdin 2021-07-21 21:56:45 +10:00
Oliver 16f54437e7 Fix: New translations django.po from Crowdin 2021-07-21 21:56:44 +10:00
Oliver 4383081174 Fix: New translations django.po from Crowdin 2021-07-21 21:56:43 +10:00
Oliver 7c69458f62 Fix: New translations django.po from Crowdin 2021-07-21 21:56:42 +10:00
Oliver ebb02f819c Fix: New translations django.po from Crowdin 2021-07-21 21:56:40 +10:00
Oliver 009ee1fb57 Fix: New translations django.po from Crowdin 2021-07-21 21:56:39 +10:00
Oliver 94a523ea84 Fix: New translations django.po from Crowdin 2021-07-21 21:56:37 +10:00
Oliver 44aba4ffbf Fix: New translations django.po from Crowdin 2021-07-21 21:56:36 +10:00
github-actions[bot] d327abe791 updated translation base 2021-07-21 11:51:23 +00:00
Oliver 20a30f317f Merge pull request #1856 from SchrodingersGat/query-filters
Add instance-specific filters to API OPTIONS data
2021-07-21 21:50:17 +10:00
Oliver 4ee0004c97 Filtering for Build and StockItem 2021-07-21 21:34:16 +10:00
Oliver 9cf372f633 PEP fixes 2021-07-21 21:24:18 +10:00
Oliver 85a40ec418 Tree exclusion for PartCategory and StockLocation 2021-07-21 21:23:30 +10:00
Oliver bee0a519ef Allow filtering of PartList by exclude_tree 2021-07-21 21:18:01 +10:00
Oliver df48df8119 Catch recursive tree error for part / variant relationship 2021-07-21 21:10:31 +10:00
Oliver dad9239a1c Add instance-specific filters to API OPTIONS data 2021-07-21 20:59:55 +10:00
Oliver 1ea1089673 Fix: New translations django.po from Crowdin 2021-07-21 15:32:01 +10:00
Oliver 3027fe2954 Fix: New translations django.po from Crowdin 2021-07-21 15:32:00 +10:00
Oliver 9ea14d78cb Fix: New translations django.po from Crowdin 2021-07-21 15:31:58 +10:00