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,697 Commits 6 Branches 99 Tags 484 MiB
d569d70f5b
Commit Graph

7697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d9673244d5
Merge pull request #1849 from SchrodingersGat/url-fix 
Fix URL patterns for ManufacturerPart and SupplierPart
 2021-07-20 15:21:32 +10: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
Oliver
4600b0d337
Update README.md 2021-07-20 11:35:55 +10: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
Oliver
8d04acd5f5
Merge pull request #1846 from matmair/bom-internal 
Allow BOM pricing to be valid when using internal pricing - style fix
 2021-07-20 07:53:43 +10: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
ca36775f62
Merge pull request #1842 from SchrodingersGat/installed-items 
Add "installed_items" as a context variable to TestReport
 2021-07-19 17:23:56 +10:00
Oliver
4413699844 PEP fixes 2021-07-19 17:23:51 +10:00