bkinnightskytw
/
InvenTree
mirror of https://github.com/inventree/InvenTree.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,566 Commits 7 Branches 163 Tags 824 MiB
Commit Graph

6125 Commits

Author SHA1 Message Date
Oliver 5448165ef3
Merge pull request #1920 from SchrodingersGat/label-print-options 
Label print options
 2021-08-07 22:27:34 +10:00
Oliver Walters ca9536f687 Implement option to display labels "inline" in the browser 2021-08-07 22:09:15 +10:00
Oliver Walters d77b99c0ca Add user settings for report and labels 2021-08-07 21:57:41 +10:00
Oliver Walters 174ac64235 Allow downloaded files to be inline or attachments 2021-08-07 21:45:18 +10:00
Oliver Walters 24638a7229 Add migration file 2021-08-07 21:41:45 +10:00
Oliver Walters 6d42cfab75 Add model validator to prevent illegal names for PartParameterTemplate 
(cherry picked from commit 93805a87e0)
 2021-08-07 21:23:52 +10:00
Oliver Walters 2e5d5bcc84 Fix part settings page 2021-08-07 20:50:32 +10:00
eeintech 6280ed1ade Moved enableNavbar to part_base template 2021-08-06 11:15:16 -04:00
eeintech 1eb8a9f310 BOM upload templates fixes 2021-08-05 17:39:08 -04:00
eeintech 1bf49a1458 Re-added ability to link manufacturer part to supplier part via API 2021-08-05 14:06:31 -04:00
Matthias Mair 96378cb556
Merge branch 'inventree:master' into trans-improv 2021-08-05 08:17:21 +02:00
Oliver 00ffab472c Fix for build report template 2021-08-05 10:44:47 +10:00
Matthias d6c6cb96ba
make keyvalue non-existing key tolerant 2021-08-05 01:24:49 +02:00
Matthias 58f2dce18d
show translation level in ui 2021-08-05 01:23:11 +02:00
Matthias d6672372a5
script to save the locale stats 2021-08-05 00:44:02 +02:00
Oliver be67832821
Merge pull request #1908 from eeintech/fix_typo 
Fixed typo for build responsible column header
 2021-08-05 08:14:51 +10:00
eeintech c0ccb8f588 Fixed typo for build responsible column header 2021-08-04 17:11:35 -04:00
Matthias 3ecb1e6577
cleaner structure 2021-08-04 19:44:01 +02:00
eeintech fbdf11e6e7 Merged run_task code into offload_task function 
Added option to force synchronous operation
Use that option for update_exchange_rates
 2021-08-04 11:23:52 -04:00
Oliver Walters c7712d4235 even more unit tests 2021-08-05 01:13:48 +10:00
Oliver Walters 655e5692e9 More unit test fixes 2021-08-05 00:58:07 +10:00
Oliver Walters 6acff2a26e Fixes unit test 2021-08-05 00:40:02 +10:00
Oliver Walters aaf394ca7a PEP fixes 2021-08-05 00:26:21 +10:00
Oliver Walters dd78464a74 remove unused function 2021-08-05 00:25:47 +10:00
Oliver Walters aa4ed9feb0 Refactor MakeVariant form 
- Now is essentially identical to the DuplicatePart form
- Uses the API form structure
 2021-08-05 00:24:38 +10:00
eeintech 1b79ef940e Merge branch 'master' of github.com:inventree/InvenTree into exchange_rate_task 2021-08-04 10:22:14 -04:00
Oliver Walters 0e8fb6a5ad Refactored DuplicatePart form 
- API endpoint now takes care of duplication of other data
 2021-08-05 00:16:42 +10:00
Oliver Walters 2cb0b448b7 Fix error message styles for API errors 
- django ValidationError uses "__all__" key for non_field_errors
- whyyyyyyyyyyyy
 2021-08-05 00:15:55 +10:00
Oliver Walters 408ff639dd Adds ability to pre-fill a form with a complete dataset 2021-08-04 23:48:21 +10:00
Oliver Walters 1fafaf8577 Refactor partfields function (was essentially duplicated) 2021-08-04 23:29:39 +10:00
Oliver Walters b04f22fc53 CreatePart form now uses the API 
- Simplify the way category parameter templates are copied
 2021-08-04 23:27:16 +10:00
Oliver Walters 2bf3e3ab02 Function to construct part form fields 2021-08-04 23:26:17 +10:00
Oliver Walters a64ee23afc Add more options for form rendering 
- "before" a field
- "after" a field
- pure "eye candy" field
 2021-08-04 23:16:11 +10:00
Oliver Walters 2e8a490ca9 Fixes for unit tests 2021-08-04 17:41:47 +10:00
Oliver Walters 75a1be0284 Use API forms for creating and editing BomItem objects 2021-08-04 17:25:51 +10:00
Matthias efd4644045
translation information 2021-08-04 07:55:58 +02:00
Oliver 1f70538b04 Adds a button to tables to reload data 2021-08-04 14:24:17 +10:00
Oliver 7911801dbf
Merge pull request #1900 from SchrodingersGat/part-image-search 
Make the part thumbnail selection window searchable
 2021-08-04 12:28:52 +10:00
Oliver 56c0e289bd Style fix 2021-08-04 12:13:24 +10:00
Oliver f95346f214 Make the part thumbnail selection window searchable 2021-08-04 12:10:49 +10:00
Oliver 989983bdb5 Fixed missing import 2021-08-04 11:37:59 +10:00
Oliver 83d8226ad6 Refactor "CreatePartCategory" form to API 
(cherry picked from commit 06ff961564)
 2021-08-04 11:34:42 +10:00
Oliver 8daf601f00
Merge pull request #1897 from matmair/price-terms 
updating language to be clearer
 2021-08-04 09:03:13 +10:00
Oliver 69f242d11d
Merge pull request #1892 from eeintech/stock_installed_items 
Re-enabled installing stock items into others
 2021-08-04 09:01:28 +10:00
Matthias fa3c5ae108 updating language to be clearer 
see https://github.com/inventree/InvenTree/issues/1889#issuecomment-891901070
 2021-08-04 00:45:56 +02:00
eeintech 29c8daed0a 'has_ipn' filter method did not return queryset 2021-08-03 12:21:44 -04:00
eeintech 172a08fbba Removed old quantity setting lines 2021-08-03 09:53:08 -04:00
Oliver f057937df0 Fix for non-integer serial numbers 2021-08-03 09:46:28 +10:00
eeintech 1c4924a4a5 Style duh 2021-08-02 15:14:55 -04:00
eeintech ac3dcac641 Re-enabled installing stock items into others 2021-08-02 15:05:24 -04:00
Oliver 9aa5086067
Merge pull request #1819 from eeintech/part_main_details 
Cleaner part details
 2021-08-02 08:47:18 +10:00
Oliver d154ca08ea
Merge pull request #1887 from matmair/settings-safety 
settings fixes
 2021-08-02 08:38:34 +10:00
Matthias 0f11ab527f PEP fix 2021-08-01 20:58:57 +02:00
Matthias 83dab558d7 catch connection errors in exchange update 
#Fixes #1888
 2021-08-01 20:44:26 +02:00
Matthias 55762f2a96 do not use safe in template 
that can cause wrong escaping and generally is considered unsafe
 2021-08-01 01:41:46 +02:00
Matthias c0921fc7ce removing unneeded prints 2021-08-01 01:16:10 +02:00
Matthias 2347f15c2e new command to cleanup old settings in db 2021-08-01 01:05:43 +02:00
Matthias 369864574e only include setting in the settings that have a key 2021-07-30 23:25:45 +02:00
eeintech 634e5e0da6 Added toggle for part details 
Added persistence for page refresh or new part page
 2021-07-30 14:55:12 -04:00
eeintech 20b21a2b71 Merge branch 'master' of github.com:inventree/InvenTree into part_main_details 2021-07-30 10:50:28 -04:00
Oliver c39e3aaa82 Bug fix 2021-07-29 17:52:24 +10:00
Oliver 542c204ca0 PEP fixes 2021-07-29 16:39:51 +10:00
Oliver dd12a593f4 Specify how many workers to use 2021-07-29 16:37:34 +10:00
Oliver 7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver 4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver 6fe5f0e0e6 Fixes for order.js 2021-07-29 11:58:32 +10:00
Oliver ba5479090a Fix nav.js 2021-07-29 11:54:04 +10:00
Oliver 28bf5bfdbc Fix table_filters.js 2021-07-29 11:52:50 +10:00
Oliver a222efda33 Fix rendering issues 2021-07-29 11:43:50 +10:00
Oliver 27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file 
- Minimal database hits required
 2021-07-29 11:28:04 +10:00
Oliver 14aebfdae1 Split dynamic javascript files into two separate directories 
- One gets translated and is served statically
- One does not get translated and is served dynamically
- Add CI step
 2021-07-29 09:23:24 +10:00
eeintech d43312d162 Missing comma propagating to translated JS files 2021-07-28 13:29:12 -04:00
Oliver baa6283d20 Fixes 2021-07-28 23:47:50 +10:00
Oliver 5744796506 Adds an API filter class for the ManufacturerPart list endpoint 2021-07-28 23:32:49 +10:00
Oliver 20b6e0fd1a
Update version.py 2021-07-28 15:46:52 +10:00
Oliver 9d9bfd6c30
Update version.py 
0.4.0 release
 2021-07-28 15:46:20 +10:00
Oliver 839cd55f20 Merge branch 'l10' into translation 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-07-28 15:23:10 +10:00
Oliver cb3ca79654 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-07-28 15:22:31 +10:00
Oliver ef2d39c980 Fix: New translations django.po from Crowdin 2021-07-28 15:13:47 +10:00
Oliver b642a48d74 Fix: New translations django.po from Crowdin 2021-07-28 15:13:46 +10:00
Oliver a58cf8ba5d Fix: New translations django.po from Crowdin 2021-07-28 15:13:45 +10:00
Oliver 050c430400 Fix: New translations django.po from Crowdin 2021-07-28 15:13:43 +10:00
Oliver 51bc060c08 Fix: New translations django.po from Crowdin 2021-07-28 15:13:42 +10:00
Oliver 970f3f94ec Fix: New translations django.po from Crowdin 2021-07-28 15:13:41 +10:00
Oliver 39f2558a33 Fix: New translations django.po from Crowdin 2021-07-28 15:13:40 +10:00
Oliver e12a0c1d83 Fix: New translations django.po from Crowdin 2021-07-28 15:13:38 +10:00
Oliver b5d8b7d363 Fix: New translations django.po from Crowdin 2021-07-28 15:13:35 +10:00
Oliver 6e1a39d491 Fix: New translations django.po from Crowdin 2021-07-28 15:13:34 +10:00
Oliver 80b0428e37 Fix: New translations django.po from Crowdin 2021-07-28 15:13:32 +10:00
Oliver f37b1d2566 Fix: New translations django.po from Crowdin 2021-07-28 15:13:31 +10:00
Oliver d4f34bf5e6 Fix: New translations django.po from Crowdin 2021-07-28 15:13:30 +10:00
Oliver 0d3b810164 Fix: New translations django.po from Crowdin 2021-07-28 15:13:29 +10:00
Oliver 3a8b319d64 Fix: New translations django.po from Crowdin 2021-07-28 15:13:27 +10:00
Oliver 8e016e5de4 Fix: New translations django.po from Crowdin 2021-07-28 15:13:26 +10:00
Oliver 2fa37cfe88 Fix: New translations django.po from Crowdin 2021-07-28 15:13:25 +10:00
Oliver 91722a9338 Fix: New translations django.po from Crowdin 2021-07-28 15:13:24 +10:00
github-actions[bot] 0cbffe9891 updated translation base 2021-07-28 05:06:04 +00:00
Oliver 78ed2776d1
Merge pull request #1863 from SchrodingersGat/settings-refactor 
Refactoring existing settings views
 2021-07-28 15:04:37 +10:00
Oliver 6fd70e4741 Fix search settings page 2021-07-28 14:18:42 +10:00
Oliver cd1ecc5e8f style fixes 2021-07-28 14:17:25 +10:00