Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,691 Commits 6 Branches 99 Tags 484 MiB
0073a77e16
Commit Graph

6200 Commits

Author SHA1 Message Date
Matthias
3f6c7df7a8 change template setting behaviour for user setting 2021-07-22 23:48:28 +02:00
Matthias
e287860e10 admin for user setting 2021-07-22 23:46:31 +02:00
Matthias
449fc329c9 usersetting edit url 2021-07-22 23:45:34 +02:00
Matthias
7ef87320a0 abstract edit 2021-07-22 23:44:25 +02:00
Matthias
6f5fc528b7 override functions 2021-07-22 23:43:51 +02:00
Matthias
8f374e255e abstract filters and refactor 2021-07-22 23:43:03 +02:00
Matthias
69ff0ac248 ruleset 2021-07-22 23:39:36 +02:00
Matthias
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
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
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
Oliver
4e507db855 Fix: New translations django.po from Crowdin 2021-07-21 15:31:57 +10:00
Oliver
550c1d4eb3 Fix: New translations django.po from Crowdin 2021-07-21 15:31:56 +10:00
Oliver
4d09486cdd Fix: New translations django.po from Crowdin 2021-07-21 15:31:54 +10:00
Oliver
d148932356 Fix: New translations django.po from Crowdin 2021-07-21 15:31:53 +10:00
Oliver
40e0fb1ef2 Fix: New translations django.po from Crowdin 2021-07-21 15:31:52 +10:00
Oliver
416e379b7b Fix: New translations django.po from Crowdin 2021-07-21 15:31:50 +10:00
github-actions[bot]
677b05fc5a updated translation base 2021-07-21 05:27:49 +00:00
Oliver
5f8c9a0f31
Merge pull request #1855 from SchrodingersGat/search-preview-results 
Add an option to configure number of parts in search preview
 2021-07-21 15:26:27 +10:00
Oliver
2ffae368f1 Add an option to configure number of parts displayed in search preview box 2021-07-21 15:05:14 +10:00
github-actions[bot]
34ef141161 updated translation base 2021-07-21 01:10:25 +00:00
Oliver
140396ccdd
Merge pull request #1854 from SchrodingersGat/url-unit-test 
Add unit test for validation of reverse url lookup
 2021-07-21 11:09:10 +10:00
github-actions[bot]
235265ed0d updated translation base 2021-07-21 00:56:49 +00:00
Oliver
15b3055e53
Merge pull request #1838 from matmair/search-autocomplete 
Search add autocomplete
 2021-07-21 10:55:40 +10:00
Oliver
893628d1b8 URL fixes 2021-07-21 10:52:14 +10:00
Oliver
8cb336f581 PEP fixes 2021-07-21 10:42:24 +10:00
Oliver
2d6a78ffb8 Add unit test for validation of reverse url lookup 2021-07-21 10:25:16 +10:00
Oliver
cf05739a02 Fix: New translations django.po from Crowdin 2021-07-21 10:11:25 +10:00
Oliver
47f300362f Fix: New translations django.po from Crowdin 2021-07-21 10:11:23 +10:00
Oliver
0509cb229f Fix: New translations django.po from Crowdin 2021-07-21 10:11:22 +10:00
Oliver
f5491d2ba6 Fix: New translations django.po from Crowdin 2021-07-21 10:11:21 +10:00
Oliver
3055bf472f Fix: New translations django.po from Crowdin 2021-07-21 10:11:18 +10:00
Oliver
9665b1086e Fix: New translations django.po from Crowdin 2021-07-21 10:11:17 +10:00
Oliver
eb845e8e2a Fix: New translations django.po from Crowdin 2021-07-21 10:11:16 +10:00
Oliver
a110e4294a Fix: New translations django.po from Crowdin 2021-07-21 10:11:14 +10:00
Oliver
4b38bdbb3e Fix: New translations django.po from Crowdin 2021-07-21 10:05:05 +10:00
github-actions[bot]
ded01c45a7 updated translation base 2021-07-20 23:43:35 +00:00
Oliver
8eeb88a0ea
Merge pull request #1850 from SchrodingersGat/api-speed 
Api speed
 2021-07-21 09:42:31 +10:00
Oliver
598ea11211 Add manager class for StockItem 2021-07-21 09:28:58 +10:00
Oliver
50c5763746 Fix: New translations django.po from Crowdin 2021-07-21 08:16:05 +10:00
Oliver
e9cf4ac47a Fix: New translations django.po from Crowdin 2021-07-21 08:16:04 +10:00
Oliver
2ef305c91e Fix: New translations django.po from Crowdin 2021-07-21 08:16:02 +10:00
Oliver
e3190bd03c Fix: New translations django.po from Crowdin 2021-07-21 08:16:01 +10:00
Oliver
55a42a4523 Fix: New translations django.po from Crowdin 2021-07-21 08:16:00 +10:00
Oliver
dd23d405bd Fix: New translations django.po from Crowdin 2021-07-21 08:15:58 +10:00
Oliver
59b256f55b Fix: New translations django.po from Crowdin 2021-07-21 08:15:57 +10:00
Oliver
222cb8bfe7 Fix: New translations django.po from Crowdin 2021-07-21 08:15:56 +10:00
Oliver
e0caf30ded Fix: New translations django.po from Crowdin 2021-07-21 08:15:55 +10:00
github-actions[bot]
0271f62d49 updated translation base 2021-07-20 22:10:55 +00:00
eeintech
8ac3d42fd8 Improved handling of po items destination 2021-07-20 17:15:01 -04:00
Matthias
ff07cf5516 cleanup 2021-07-20 18:52:52 +02:00
Matthias
30f94bef41 adding style and picture 2021-07-20 18:51:27 +02:00
Oliver
5e2145e151 Bug fix - delete line which don't belong no more 2021-07-20 22:26:43 +10:00
Oliver
b04a403081 subclass TreeManager 2021-07-20 22:15:49 +10:00
Oliver
cb0b7209ec Add custom "list" function back in 
- Actually does make a significant difference to query speed
 2021-07-20 22:12:01 +10:00
Oliver
4199e7567f Remove duplicate annotation call 2021-07-20 21:46:27 +10:00
Oliver
dbe550a159 Optimizations for PartList API endpoint: 
- Remove custom list() function
- Queryset prefetch now performed by the model manager
 2021-07-20 21:37:32 +10:00
Oliver
84fc2785d6 Create a custom Manager class for the Part model 
- Always perform prefetch_related calls
 2021-07-20 21:26:51 +10:00
Matthias
d0e425ad30 Merge branch 'search-autocomplete' of https://github.com/matmair/InvenTree into search-autocomplete 2021-07-20 07:49:42 +02:00
Matthias
289b030f4e limit results in response 2021-07-20 07:49:21 +02:00
github-actions[bot]
56b95d31da updated translation base 2021-07-20 05:22:50 +00:00
Oliver
b0c4a58f30 Fix URL patterns for ManufacturerPart and SupplierPart 2021-07-20 15:06:09 +10:00
Oliver
1e8e6eb556 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-20 12:17:26 +10:00
github-actions[bot]
fa03263821 updated translation base 2021-07-20 01:37:05 +00:00
Matthias
ce3f7b698d InvenTreeUserSettings added 2021-07-20 01:35:58 +02:00
Matthias
ec53099872 abstracting Settings model 2021-07-20 01:34:35 +02:00
Oliver
d3aa849172 Fix: New translations django.po from Crowdin 2021-07-20 08:24:32 +10:00
Oliver
65084c3e7e Fix: New translations django.po from Crowdin 2021-07-20 08:24:31 +10:00
Oliver
51cf97dcae Fix: New translations django.po from Crowdin 2021-07-20 08:24:30 +10:00
Oliver
19ba6c9379 Fix: New translations django.po from Crowdin 2021-07-20 08:24:28 +10:00
Oliver
aa8f1989ab Fix: New translations django.po from Crowdin 2021-07-20 08:24:27 +10:00
Oliver
949d8360b2 Fix: New translations django.po from Crowdin 2021-07-20 08:24:26 +10:00
Oliver
86069770c9 Fix: New translations django.po from Crowdin 2021-07-20 08:24:25 +10:00
Oliver
da2a105067 Fix: New translations django.po from Crowdin 2021-07-20 08:24:23 +10:00
Oliver
3a801dc090 Fix: New translations django.po from Crowdin 2021-07-20 08:24:22 +10:00
github-actions[bot]
7d342f6bec updated translation base 2021-07-19 21:59:56 +00:00
Oliver
17c8dc3441
Merge pull request #1844 from eeintech/po_import 
Purchase Order File Upload Update
 2021-07-20 07:58:48 +10:00
github-actions[bot]
2397458144 updated translation base 2021-07-19 21:55:14 +00:00
Matthias Mair
ebb202b19b
Merge branch 'inventree:master' into search-autocomplete 2021-07-19 23:39:16 +02:00
Oliver
5f48c8c95a Fix: New translations django.po from Crowdin 2021-07-20 07:19:48 +10:00
eeintech
456710c5ce clean_decimal should also check if the string can be converted to Decimal type 2021-07-19 15:57:51 -04:00
Matthias Mair
c2ce569506
Merge branch 'inventree:master' into bom-internal 2021-07-19 21:51:18 +02:00
eeintech
53f2aa107a Umm watch out for the true fix! 2021-07-19 15:51:04 -04:00
Matthias
8d2e910323 style fix 2021-07-19 21:50:06 +02:00
eeintech
9acd57f8e0 CI was not completely fixed 2021-07-19 15:29:04 -04:00
eeintech
c1db4c7b3d Try to catch encoding error, fixed CI 2021-07-19 15:14:08 -04:00
eeintech
3ab058e84b Fixed default currency selection 2021-07-19 14:49:55 -04:00
eeintech
23db7a89a9 Updated PO upload template, moved call to button, improved cleaned_decimal method to handle comma separator 2021-07-19 14:20:54 -04:00
eeintech
2703ae520e Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-19 09:20:06 -04:00
Oliver Walters
886f300cc1 Merge remote-tracking branch 'upstream/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-19 18:38:42 +10:00
Oliver
dddd794eb9 Fix: New translations django.po from Crowdin 2021-07-19 17:47:39 +10:00
Oliver
29544236ae Fix: New translations django.po from Crowdin 2021-07-19 17:47:37 +10:00
Oliver
0b199de29e Fix: New translations django.po from Crowdin 2021-07-19 17:47:36 +10:00
Oliver
bbd6527b31 Fix: New translations django.po from Crowdin 2021-07-19 17:47:34 +10:00
Oliver
c4331cd4d7 Fix: New translations django.po from Crowdin 2021-07-19 17:47:33 +10:00
Oliver
7fd51b322f Fix: New translations django.po from Crowdin 2021-07-19 17:47:32 +10:00
Oliver
1c58685e4f Fix: New translations django.po from Crowdin 2021-07-19 17:47:31 +10:00
Oliver
7f6c106618 Fix: New translations django.po from Crowdin 2021-07-19 17:47:29 +10:00
Oliver
92fcd57f5f Fix: New translations django.po from Crowdin 2021-07-19 17:47:28 +10:00
github-actions[bot]
1c53bc6ae1 updated translation base 2021-07-19 07:46:21 +00:00
Oliver
af68ea23c3
Merge pull request #1843 from SchrodingersGat/stock-export 
Stock export
 2021-07-19 17:45:11 +10:00
github-actions[bot]
a033b075db updated translation base 2021-07-19 07:25:11 +00:00
Oliver
4413699844 PEP fixes 2021-07-19 17:23:51 +10:00
Oliver
efb4f194b6 Refactor StockExportOptions form 2021-07-19 17:23:18 +10:00
Oliver
87d4a51575 Add "installed items" section to default TestReport 2021-07-19 16:44:56 +10:00
Oliver
4fdb18318a Add "installed_items" as a context variable to the StockItem TestReport template 2021-07-19 16:32:36 +10:00
github-actions[bot]
ab60c030ff updated translation base 2021-07-19 05:58:04 +00:00
Matthias
1d549bcdbd style fix 2021-07-19 07:56:55 +02:00
Oliver
e7d9485c16
Merge pull request #1841 from SchrodingersGat/api-bump 
0.3.1
 2021-07-19 15:56:39 +10:00
Matthias
43f1e2b8f9 switching back to using extensive apis for search 2021-07-19 07:54:12 +02:00
Oliver
5559db75e6 Fix: New translations django.po from Crowdin 2021-07-19 15:28:16 +10:00
Oliver
96e26afa9b Fix: New translations django.po from Crowdin 2021-07-19 15:28:14 +10:00
Oliver
3fdf48b972 Fix: New translations django.po from Crowdin 2021-07-19 15:28:13 +10:00
Oliver
b35df40cf2 Fix: New translations django.po from Crowdin 2021-07-19 15:28:12 +10:00
Oliver
a7cd34c81b Fix: New translations django.po from Crowdin 2021-07-19 15:28:09 +10:00
Oliver
c02173e558 Fix: New translations django.po from Crowdin 2021-07-19 15:28:08 +10:00
Oliver
f6463086eb Fix: New translations django.po from Crowdin 2021-07-19 15:28:06 +10:00
Oliver
76b2162a04 Fix: New translations django.po from Crowdin 2021-07-19 15:28:05 +10:00
Oliver
1c843671e9 Fix: New translations django.po from Crowdin 2021-07-19 15:28:04 +10:00
Oliver
e04bbb016d 0.3.1 
Bumped API version to 8
 2021-07-19 15:10:57 +10:00
github-actions[bot]
f894f2cab9 updated translation base 2021-07-19 05:04:50 +00:00
Oliver
40c203c123 Ensure BOM pricing table is loaded 2021-07-19 14:40:02 +10:00
Oliver
bbada3e873 Fix duplicate table naming 2021-07-19 14:34:58 +10:00
Oliver
bf20e3906a Fix: New translations django.po from Crowdin 2021-07-19 12:21:32 +10:00
Oliver
78d4f8a4a7 Fix: New translations django.po from Crowdin 2021-07-19 12:21:31 +10:00
Oliver
642d670b54 Fix: New translations django.po from Crowdin 2021-07-19 12:21:29 +10:00
Oliver
f900b01298 Fix: New translations django.po from Crowdin 2021-07-19 12:21:26 +10:00
Oliver
1f7e4593d5 Fix: New translations django.po from Crowdin 2021-07-19 12:21:24 +10:00
Oliver
2e91511a25 Fix: New translations django.po from Crowdin 2021-07-19 12:21:22 +10:00
Oliver
591daaab60 Fix: New translations django.po from Crowdin 2021-07-19 12:21:21 +10:00
Oliver
8e7d980072 Fix: New translations django.po from Crowdin 2021-07-19 12:21:19 +10:00
Oliver
4c2929143d Fix: New translations django.po from Crowdin 2021-07-19 12:21:18 +10:00
github-actions[bot]
633e15d454 updated translation base 2021-07-19 01:19:01 +00:00
Oliver
fa9ef02d23
Merge pull request #1836 from SchrodingersGat/supplier-part-forms 
Supplier part forms
 2021-07-19 11:17:45 +10:00
Oliver
33e70ec5a7 Unit test fixes 2021-07-19 10:55:23 +10:00
Oliver
00a1b17d84 Fix: New translations django.po from Crowdin 2021-07-19 10:13:21 +10:00
Oliver
a2972f170b Fix: New translations django.po from Crowdin 2021-07-19 10:13:20 +10:00
Oliver
68f545078b Fix: New translations django.po from Crowdin 2021-07-19 10:13:19 +10:00
Oliver
45beea6c8d Fix: New translations django.po from Crowdin 2021-07-19 10:13:17 +10:00
Oliver
8431ff4685 Fix: New translations django.po from Crowdin 2021-07-19 10:13:16 +10:00
Oliver
3cdcc7b432 Fix: New translations django.po from Crowdin 2021-07-19 10:13:15 +10:00
Oliver
766a327871 Fix: New translations django.po from Crowdin 2021-07-19 10:13:14 +10:00
Oliver
7dec71fc68 Fix: New translations django.po from Crowdin 2021-07-19 10:13:12 +10:00
Oliver
c5614e9452 Fix: New translations django.po from Crowdin 2021-07-19 10:13:11 +10:00
github-actions[bot]
c9437fd49e updated translation base 2021-07-18 23:55:05 +00:00
Oliver
efd0caba6e
Merge pull request #1829 from matmair/initial-amount 
Initial amount
 2021-07-19 09:53:40 +10:00
Oliver
565fe9a98e Remove custom creation code for SupplierPart serializer 2021-07-19 09:44:48 +10:00
Matthias
4013abe4de style fix 2021-07-19 01:26:26 +02:00
Matthias
6ca34276bd refactor 2021-07-19 01:17:32 +02:00
Matthias
866c8af393 adding styling to autocomplete 2021-07-19 01:07:33 +02:00
Matthias
17eee66b95 Adding search auto-complete #280 2021-07-19 00:46:51 +02:00
Oliver
e0aabe01f2 Fix: New translations django.po from Crowdin 2021-07-19 08:06:05 +10:00
Oliver
16eca8447b Fix: New translations django.po from Crowdin 2021-07-19 07:02:49 +10:00
Matthias
c71fbf7893 added autocomplete to jquery ui 2021-07-18 20:57:15 +02:00
Oliver Walters
0d660e3c69 Unit test fixes 
(cherry picked from commit 787064abc0)
 2021-07-19 00:24:21 +10:00
Oliver Walters
0288a1acbf Refactor edit and delete views for ManufacturerPart 2021-07-18 22:59:34 +10:00
Oliver Walters
0c91691ed2 Refactor SupplierPartEdit and SupplierPartDelete forms 2021-07-18 22:46:23 +10:00
Oliver Walters
29d7cb40e1 Add edit and delete buttons for supplier-part table 2021-07-18 22:31:04 +10:00
Oliver Walters
56fa6c512b Refactor SupplierPartCreate form 2021-07-18 22:21:11 +10:00
Oliver
e27687de52 Fix: New translations django.po from Crowdin 2021-07-18 22:00:28 +10:00
Oliver
f2d95ba246 Fix: New translations django.po from Crowdin 2021-07-18 22:00:27 +10:00
Oliver
7d9fe91ac8 Fix: New translations django.po from Crowdin 2021-07-18 22:00:26 +10:00
Oliver
8fe8d5657b Fix: New translations django.po from Crowdin 2021-07-18 22:00:24 +10:00
Oliver
09ac6d047f Fix: New translations django.po from Crowdin 2021-07-18 22:00:23 +10:00
Oliver
c0b2e6eca3 Fix: New translations django.po from Crowdin 2021-07-18 22:00:21 +10:00
Oliver
bf6a660872 Fix: New translations django.po from Crowdin 2021-07-18 22:00:20 +10:00
Oliver
809fc98576 Fix: New translations django.po from Crowdin 2021-07-18 22:00:19 +10:00
Oliver
48d5a100d7 Fix: New translations django.po from Crowdin 2021-07-18 22:00:18 +10:00
github-actions[bot]
263429b76a updated translation base 2021-07-18 11:47:28 +00:00
Oliver
f9b7257bdb
Merge pull request #1835 from SchrodingersGat/disable-secondary 
Disable secondary modals
 2021-07-18 21:46:22 +10:00
github-actions[bot]
4271912c19 updated translation base 2021-07-18 11:42:53 +00:00
Oliver
14e2cabffa
Merge pull request #1834 from SchrodingersGat/add-line-item-fix 
Add 'destination' field to POLineItem API serializer
 2021-07-18 21:41:29 +10:00
github-actions[bot]
bdc684f77e updated translation base 2021-07-18 11:34:00 +00:00
Oliver
b1165af3c3
Merge pull request #1833 from SchrodingersGat/part-cat-form-improvements 
Part cat form improvements
 2021-07-18 21:32:31 +10:00
Oliver Walters
b04d6051a4 Disable secondary modals 2021-07-18 21:32:25 +10:00
Oliver Walters
e17b92b126 Add 'destination' field to POLineItem API serializer 2021-07-18 21:25:59 +10:00
Oliver Walters
c33cfe9503 Small rendering improvements 2021-07-18 21:17:03 +10:00
Oliver Walters
753fe9c80f Ordering and rendering for StockLocation 2021-07-18 21:15:51 +10:00
Oliver Walters
36cf614aed Add "level" to PartCategory serializer 
- Also use tree ordering by default
 2021-07-18 21:11:53 +10:00
Oliver
f63f015b86 Fix: New translations django.po from Crowdin 2021-07-18 11:09:37 +10:00
Oliver
aee27e3cca Fix: New translations django.po from Crowdin 2021-07-18 11:09:35 +10:00
Oliver
da847b0eff Fix: New translations django.po from Crowdin 2021-07-18 11:09:34 +10:00
Oliver
d6a535e818 Fix: New translations django.po from Crowdin 2021-07-18 11:09:33 +10:00
Oliver
c5e48d19ce Fix: New translations django.po from Crowdin 2021-07-18 11:09:31 +10:00
Oliver
e18c959eaa Fix: New translations django.po from Crowdin 2021-07-18 11:09:30 +10:00
Oliver
f0cf3597b0 Fix: New translations django.po from Crowdin 2021-07-18 11:09:29 +10:00
Oliver
299c7033bf Fix: New translations django.po from Crowdin 2021-07-18 11:09:28 +10:00
Oliver
405aaca2c0 Fix: New translations django.po from Crowdin 2021-07-18 11:09:26 +10:00
github-actions[bot]
12abe9f565 updated translation base 2021-07-18 01:05:30 +00:00
Matthias
eba5512a38 extending form for stock creation 2021-07-18 02:58:39 +02:00
Oliver Walters
f4f7514b45 Similar fix for customer_reference field 2021-07-18 10:47:35 +10:00
Oliver Walters
9719a14587 Add supplier_reference field to form 2021-07-18 10:33:27 +10:00
Matthias
44482800e4 switching out icon for setting 2021-07-18 02:27:15 +02:00
Matthias
210a4bccde setting for #1796 2021-07-18 02:20:56 +02:00
eeintech
f938e722b9 Another shot at it! 2021-07-16 12:08:26 -04:00
eeintech
86f3f56a60 Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-16 10:43:53 -04:00
Oliver
13ade982b9 Fix: New translations django.po from Crowdin 2021-07-16 14:51:23 +10:00
Oliver
3dd2523f28 Fix: New translations django.po from Crowdin 2021-07-16 14:51:22 +10:00
Oliver
e902a17cb8 Fix: New translations django.po from Crowdin 2021-07-16 14:51:21 +10:00
Oliver
521685de7c Fix: New translations django.po from Crowdin 2021-07-16 14:51:19 +10:00
Oliver
222c854423 Fix: New translations django.po from Crowdin 2021-07-16 14:51:18 +10:00
Oliver
58297ec10d Fix: New translations django.po from Crowdin 2021-07-16 14:51:17 +10:00
Oliver
73cdfe1773 Fix: New translations django.po from Crowdin 2021-07-16 14:51:15 +10:00
Oliver
518e6dd0eb Fix: New translations django.po from Crowdin 2021-07-16 14:51:14 +10:00
Oliver
9a84ecdec6 Fix: New translations django.po from Crowdin 2021-07-16 14:51:13 +10:00
github-actions[bot]
1fa944974b updated translation base 2021-07-16 03:55:57 +00:00
Oliver
5ce6dd325d
Merge pull request #1824 from SchrodingersGat/po-currency 
Use default curreny code
 2021-07-16 13:54:41 +10:00
github-actions[bot]
cea6fc9ca7 updated translation base 2021-07-16 03:44:16 +00:00
Oliver
733951883e Use default curreny code 2021-07-16 13:35:51 +10:00
Oliver
0fcb4e3170 Link fixes 2021-07-16 13:30:11 +10:00
Oliver
c19c64ffff Fix: New translations django.po from Crowdin 2021-07-16 07:44:25 +10:00
Oliver
d836003eac Fix: New translations django.po from Crowdin 2021-07-16 07:44:24 +10:00
Oliver
781055e8bc Fix: New translations django.po from Crowdin 2021-07-16 07:44:22 +10:00
Oliver
77905e1cb7 Fix: New translations django.po from Crowdin 2021-07-16 07:44:21 +10:00
Oliver
a8fd94fb04 Fix: New translations django.po from Crowdin 2021-07-16 07:44:20 +10:00
Oliver
f051ae685e Fix: New translations django.po from Crowdin 2021-07-16 07:44:19 +10:00
Oliver
b6090bb910 Fix: New translations django.po from Crowdin 2021-07-16 07:44:17 +10:00
Oliver
27d3173d26 Fix: New translations django.po from Crowdin 2021-07-16 07:44:16 +10:00
Oliver
b8f1a4233a Fix: New translations django.po from Crowdin 2021-07-16 07:44:15 +10:00
github-actions[bot]
b5d2275011 updated translation base 2021-07-15 21:34:38 +00:00
Oliver
3f3d058bfa
Merge pull request #1817 from SchrodingersGat/spa-bug-fix 
Fixes for issues with new SPA approach
 2021-07-16 07:33:28 +10:00
eeintech
886d95e467 Easy fix! 2021-07-15 16:31:07 -04:00
eeintech
bfc421c50b Cleaner part details 2021-07-15 14:52:33 -04:00
Oliver
cbbd58c743 Fixes for issues with new SPA approach 
- Fix manufacturer part table
- Fix supplier part table
- Consolidate manufacturer and supplier parts onto single page
- CSS fixes
 2021-07-16 01:13:48 +10:00
Oliver
1665a8dbd4 Fix: New translations django.po from Crowdin 2021-07-15 23:54:48 +10:00
Oliver
07178d44d3 Fix: New translations django.po from Crowdin 2021-07-15 23:54:47 +10:00
Oliver
747d51ee50 Fix: New translations django.po from Crowdin 2021-07-15 23:54:46 +10:00
Oliver
d56f781989 Fix: New translations django.po from Crowdin 2021-07-15 23:54:45 +10:00
Oliver
ebde0793f2 Fix: New translations django.po from Crowdin 2021-07-15 23:54:43 +10:00
Oliver
16c2a91931 Fix: New translations django.po from Crowdin 2021-07-15 23:54:42 +10:00
Oliver
47363894a7 Fix: New translations django.po from Crowdin 2021-07-15 23:54:40 +10:00
Oliver
78eb16a770 Fix: New translations django.po from Crowdin 2021-07-15 23:54:39 +10:00
Oliver
e20c9555d8 Fix: New translations django.po from Crowdin 2021-07-15 23:54:38 +10:00
github-actions[bot]
405ba964ba updated translation base 2021-07-15 13:45:09 +00:00
Oliver
bb60eed897
Merge pull request #1811 from SchrodingersGat/spa 
Dynamically switch between navbar selections on pages
 2021-07-15 23:43:43 +10:00
Oliver
28b3432afe Delete outdated unit test 2021-07-15 23:19:47 +10:00
Oliver
e86e15df99 Fix part import form 2021-07-15 23:18:41 +10:00
Oliver
e116ef9a8b Fix BOM upload form 2021-07-15 23:14:40 +10:00
Oliver
09d175f7cf Fix purchase order import form 2021-07-15 23:11:59 +10:00
Oliver
c61fc7c1df Refactor part pricing page 2021-07-15 23:06:37 +10:00
Oliver
0fc558068f Refactor BuildOrder pages 2021-07-15 22:40:14 +10:00
Oliver
533a3aa368 Refactor StockItem pages 2021-07-15 22:19:13 +10:00
Oliver
b1640fcc23 Refactor StockLocation pages 2021-07-15 21:38:05 +10:00
Oliver
676cca89a1 Refactor ManufacturerPart pages 2021-07-15 21:32:46 +10:00
Oliver
52da678636 Refactor SupplierPart page 2021-07-15 21:24:33 +10:00
Oliver
72337dab49 Refactor PartCategory views 2021-07-15 17:26:06 +10:00
Oliver
d5bf108fef Remove unused template file 2021-07-15 16:54:49 +10:00
Oliver
df89008116 Refactor allocation page(s) 
- Also perform null check on notes before displaying
 2021-07-15 16:53:14 +10:00
Oliver
e38d740bbc Refactor "used in" page 2021-07-15 16:44:46 +10:00
Oliver
e7c7bdcd00 Refactor BOM page 2021-07-15 16:42:28 +10:00
Oliver
57851b0eaf Refactor build orders display 2021-07-15 16:36:20 +10:00
Oliver
c8c7f78ce9 Refactor "related parts" view 2021-07-15 16:28:26 +10:00
Oliver
8607d702c4 Refactor variants page 2021-07-15 16:17:41 +10:00
Oliver
985bd39234 Fix links 2021-07-15 16:14:48 +10:00
Oliver
84149d34a6 Refactor part-supplier view 2021-07-15 16:12:27 +10:00
Oliver
984e16d5af Return all part parameters to the main part edit form 
- refactor purchaseorder view
- refactor salesorder view
 2021-07-15 16:07:46 +10:00
Oliver
352a58b373 Can select nav based on URL query parameter 2021-07-15 13:41:26 +10:00
Oliver
3786454e4c Remove URL 2021-07-15 12:56:26 +10:00
Oliver
1a30a5bc16 Merge "test template" page 2021-07-15 12:56:17 +10:00
Oliver
2d2ad91545 Move "stock" part view 2021-07-15 12:52:36 +10:00
Oliver
0667857754 Refactor part base display 2021-07-15 12:04:48 +10:00
github-actions[bot]
c3ef65102d updated translation base 2021-07-14 23:56:02 +00:00
Oliver
94792596e9
Update version.py 
Bumped version number
 2021-07-15 09:54:55 +10:00
Oliver
b6e73523a1 Fix: New translations django.po from Crowdin 2021-07-14 08:32:46 +10:00
Oliver
02c9d71a68 Fix: New translations django.po from Crowdin 2021-07-14 08:32:44 +10:00
Oliver
b3caedc6f6 Fix: New translations django.po from Crowdin 2021-07-14 08:32:41 +10:00
Oliver
e56a375bb5 Fix: New translations django.po from Crowdin 2021-07-14 08:32:40 +10:00
Oliver
ea1bb8bdf0 Fix: New translations django.po from Crowdin 2021-07-14 08:32:39 +10:00
Oliver
4b472023ad Fix: New translations django.po from Crowdin 2021-07-14 08:32:37 +10:00
Oliver
bf73ce8b6f Fix: New translations django.po from Crowdin 2021-07-14 08:32:36 +10:00
Oliver
efba9d63e6 Fix: New translations django.po from Crowdin 2021-07-14 08:32:33 +10:00
Oliver
5be4eefb2d Fix: New translations django.po from Crowdin 2021-07-14 08:32:32 +10:00
github-actions[bot]
57dcaa88ae updated translation base 2021-07-13 22:00:36 +00:00
Oliver
f41f1316d9 Fix: New translations django.po from Crowdin 2021-07-14 06:23:18 +10:00
eeintech
3d9ad24e27 Defined custom SupplierPart object manager and prefetch related models in all queries 2021-07-13 12:55:36 -04:00
Oliver
8fed3b3522 Typo fix 2021-07-13 22:03:49 +10:00
Oliver
8dde89e781 Table fixes 2021-07-13 21:57:49 +10:00
Oliver
c1c0a262b2 Refactor Company detail view 2021-07-13 21:53:48 +10:00
Oliver
b6227f7d28 Refactor PurchaseOrder display 2021-07-13 21:21:00 +10:00
Oliver
65de52b705 Add javascript to dynamically switch between views 2021-07-13 20:58:05 +10:00
Oliver
9889e314a9 Remove unused templates 2021-07-13 20:04:12 +10:00
Oliver
970f08260c Update navbar 2021-07-13 20:04:02 +10:00
Oliver
39c58e4015 Move all "SalesOrder" content onto a single page 2021-07-13 19:59:11 +10:00
Oliver
a0b3359d62 Fix filtering for build orders 2021-07-13 19:58:47 +10:00
Oliver
b0dc76a4d6 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-13 19:42:07 +10:00
Oliver
30b99f0963 Fix: New translations django.po from Crowdin 2021-07-13 00:31:46 +10:00
Oliver
e8d86cccf2 Fix: New translations django.po from Crowdin 2021-07-13 00:31:45 +10:00
Oliver
8bb60c72bf Fix: New translations django.po from Crowdin 2021-07-13 00:31:42 +10:00
Oliver
5b9cdcf834 Fix: New translations django.po from Crowdin 2021-07-13 00:31:41 +10:00
Oliver
d117f15553 Fix: New translations django.po from Crowdin 2021-07-13 00:31:39 +10:00
Oliver
a558e2ebe8 Fix: New translations django.po from Crowdin 2021-07-13 00:31:38 +10:00
Oliver
d2f23124c0 Fix: New translations django.po from Crowdin 2021-07-13 00:31:36 +10:00
Oliver
f404881514 Fix: New translations django.po from Crowdin 2021-07-13 00:31:35 +10:00
Oliver
92187fd230 Fix: New translations django.po from Crowdin 2021-07-13 00:31:34 +10:00
github-actions[bot]
5d83d86f7d updated translation base 2021-07-12 13:57:52 +00:00
Oliver
cf23fb6fe8 PEP fixes 2021-07-12 23:32:08 +10:00
Oliver
b1af07c8cb Remove stale pages 2021-07-12 23:31:10 +10:00
Oliver
77d80f5c0f Move "attachments" and "notes" to "Part Detail" page 
(cherry picked from commit daf0a082dc04c04cfd68cab70148a7d7cf28460f)
 2021-07-12 23:27:50 +10:00
Oliver
9d2531b195 Fix: New translations django.po from Crowdin 2021-07-12 23:24:30 +10:00
Oliver
46f7eac791 Fix: New translations django.po from Crowdin 2021-07-12 23:24:29 +10:00
Oliver
cf9c9c139d Fix: New translations django.po from Crowdin 2021-07-12 23:24:27 +10:00
Oliver
e00654f2c5 Fix: New translations django.po from Crowdin 2021-07-12 23:24:26 +10:00
Oliver
d89ce0dceb Fix: New translations django.po from Crowdin 2021-07-12 23:24:25 +10:00
Oliver
b8ad876cd2 Fix: New translations django.po from Crowdin 2021-07-12 23:24:23 +10:00
Oliver
c5fa167413 Fix: New translations django.po from Crowdin 2021-07-12 23:24:22 +10:00
Oliver
d586139d47 Fix: New translations django.po from Crowdin 2021-07-12 23:24:20 +10:00
Oliver
8ff98f061c Fix: New translations django.po from Crowdin 2021-07-12 23:24:19 +10:00
github-actions[bot]
7e3177d1c4 updated translation base 2021-07-12 12:41:33 +00:00
Oliver
6af05b2b83
Merge pull request #1807 from SchrodingersGat/forms-cleanup 
Remove unused forms
 2021-07-12 22:40:20 +10:00
github-actions[bot]
18c5054cf6 updated translation base 2021-07-12 12:24:28 +00:00
Oliver
374c3676a3
Merge pull request #1806 from SchrodingersGat/manufacturer-part-api-form 
Refactor ManufacturerPartCreate form
 2021-07-12 22:23:15 +10:00
Oliver
0cb2b49333 Remove unused forms 2021-07-12 22:23:08 +10:00
github-actions[bot]
2921f34e20 updated translation base 2021-07-12 12:18:41 +00:00
Oliver
bd8b52d7d2
Merge pull request #1804 from SchrodingersGat/api-stock-adjustments 
Api stock adjustments
 2021-07-12 22:16:56 +10:00
Oliver
7c80767414 PEP fixes 2021-07-12 22:06:03 +10:00
Oliver
30fd3c8841 Unit test fixes 2021-07-12 22:03:36 +10:00
github-actions[bot]
d74cacd059 updated translation base 2021-07-12 11:35:28 +00:00
Oliver
c3b0593aba Refactor ManufacturerPartCreate form 2021-07-12 21:32:09 +10:00
Oliver
ccf17bf4c5 Fix dodgy CSS file 2021-07-12 21:19:00 +10:00
Oliver
77cfadad42 Add 'title' option for contsructed fields 2021-07-12 21:11:29 +10:00
Oliver
52eedef820 remove old StockAdjust view 2021-07-12 21:03:28 +10:00
Oliver
edf4aab063 Refactor "showQuestionDialog" function 2021-07-12 21:03:01 +10:00
Oliver
a1579eecfd Refactor "showAlertDialog" function 2021-07-12 20:55:28 +10:00
Oliver
e9bf4b4cef Add some more functionality to StockLocation page 2021-07-12 20:53:36 +10:00
Oliver
2ea4824030 Add option to move stock for a part 2021-07-12 20:45:45 +10:00
Oliver
9fc7976569 Refactor all "adjustment" forms to use the new API approach 2021-07-12 20:38:54 +10:00
Oliver
74e5b2cd3f Handle delete differently 2021-07-12 20:06:53 +10:00
Oliver
2bebf2d41a Test fixes 2021-07-12 20:00:50 +10:00
Oliver
11ee8e8369 Raise error if specified quantity is above available quantity 2021-07-12 19:59:10 +10:00
Oliver
5329e3e56c Display per-line errors 2021-07-12 19:42:06 +10:00
Oliver
51314a0261 Refactor error messaging for stock adjustment API 2021-07-12 19:41:50 +10:00
Oliver
e04828214a Refactor showApiError() function 2021-07-12 19:20:29 +10:00
Oliver
0c41cc7c77 Handle form submissions 2021-07-12 18:13:06 +10:00
Oliver
e3f85414fa Stock API URL cleanup 2021-07-12 17:32:06 +10:00
Oliver
747cccfa42 Refactor to use more generic forms approach 2021-07-12 16:55:35 +10:00
Oliver
7531984c78 Fix read_only attribute 2021-07-11 21:17:54 +10:00
Oliver
cc90c8abbe Move buttons to separate table column 2021-07-11 21:15:06 +10:00
Oliver
9eb1367d80 Add "location" field 2021-07-11 21:07:56 +10:00
Oliver
3efd7f7777 Add a "notes" field 2021-07-11 20:56:29 +10:00
Oliver
ca5d3a57de Set quantity input parameters based on action 2021-07-11 20:49:54 +10:00
Oliver
9e4bc274cf Allow custom code to be run on form submission 2021-07-11 20:40:27 +10:00
Oliver
c045a3b6f6 Refactorin' 2021-07-11 20:36:52 +10:00
github-actions[bot]
999dc29abd updated translation base 2021-07-10 23:05:29 +00:00
Oliver
0be787ea5b
Merge pull request #1802 from matmair/next-btn-leadingzero 
support leading zeros in serial numbers
 2021-07-11 09:04:09 +10:00
Matthias
03fb6e5c61 support leading zeros in serial numbers 2021-07-10 17:54:17 +02:00
Oliver
7f8d2fa795 Fix: New translations django.po from Crowdin 2021-07-11 00:25:17 +10:00
Oliver
7806d679f5 Fix: New translations django.po from Crowdin 2021-07-11 00:25:16 +10:00
Oliver
d46181c4fe Fix: New translations django.po from Crowdin 2021-07-11 00:25:15 +10:00
Oliver
06387976d8 Fix: New translations django.po from Crowdin 2021-07-11 00:25:14 +10:00
Oliver
64fee6739c Fix: New translations django.po from Crowdin 2021-07-11 00:25:12 +10:00
Oliver
78511b47c0 Fix: New translations django.po from Crowdin 2021-07-11 00:25:11 +10:00
Oliver
cc369ecb76 Fix: New translations django.po from Crowdin 2021-07-11 00:25:10 +10:00
Oliver
b9c8078807 Fix: New translations django.po from Crowdin 2021-07-11 00:25:08 +10:00
Oliver
ba0b658d59 Fix: New translations django.po from Crowdin 2021-07-11 00:25:07 +10:00
Oliver
14ab1bef14 Callback to remove row 2021-07-11 00:15:46 +10:00
Oliver
0507e8a3bc Building stock adjustment modal 2021-07-10 23:59:35 +10:00
github-actions[bot]
f389f53d2f updated translation base 2021-07-10 13:28:24 +00:00
Oliver
02214ea713
Merge pull request #1799 from SchrodingersGat/bom-export-fix 
Bug fix for BOM export
 2021-07-10 23:27:17 +10:00
Oliver
30ec9fcf46
New Crowdin updates (#1800) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-07-10 23:08:52 +10:00
Oliver
7cc1063114 PEP 2021-07-10 23:04:34 +10:00
Oliver
73e03636a2 Add unit tests 2021-07-10 23:04:20 +10:00
github-actions[bot]
f20e1ff38e updated translation base 2021-07-10 04:16:07 +00:00
Oliver
cf66a386ea Bug fix 2021-07-10 14:13:46 +10:00
Oliver
8a1909fe86
New Crowdin updates (#1798) 
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
 2021-07-10 14:02:26 +10:00
github-actions[bot]
b4efdf7723 updated translation base 2021-07-10 03:48:49 +00:00
Oliver
bf2774eb21 Add numerical validation step for BomItem 2021-07-10 13:48:44 +10:00
Oliver
f6d5bd4ed8
Merge pull request #1760 from eeintech/bom_import 
Converted BOM import to new multi-step form framework
 2021-07-10 13:47:25 +10:00