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
5,492 Commits 6 Branches 99 Tags 484 MiB
495babe712
Commit Graph

5492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
2a64e4a309 Bug fix for template 2021-05-27 13:23:20 +10:00
Oliver
8501aba368
Merge pull request #1609 from SchrodingersGat/variant-convert 
Expand possibilities for variant conversion
 2021-05-27 13:18:48 +10:00
Oliver Walters
4abd3524b4 Looks like py-moneyed has been updated 2021-05-27 12:59:30 +10:00
Oliver Walters
4df7e53bb8 Add DEFAULT_CURRENCY option 2021-05-27 12:55:30 +10:00
Oliver Walters
c2fe5e08b4 Expand possibilities for variant conversion 
- Ref get_conversion_options
 2021-05-27 12:35:55 +10:00
eeintech
bf83cfb04c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-26 09:28:55 -04:00
Matthias
9d5b90190b style + merge fix 2021-05-26 13:18:07 +02:00
Matthias Mair
859a3178a4
Merge branch 'master' into part-import 2021-05-26 13:08:58 +02:00
Matthias
79374c5dfd ajax implementation for part import 2021-05-26 13:05:20 +02:00
Matthias
421b0a896d AjaxView for reuse of FormViews 2021-05-26 13:04:21 +02:00
Matthias
002706849c enrich context with form if not set 2021-05-26 12:20:37 +02:00
Oliver
3a36e800c0
Merge pull request #1600 from eeintech/update_rates_manual 
Currencies settings and exchange rates list/refresh
 2021-05-26 19:10:43 +10:00
Matthias
4319ba16af Settings to show import-button 2021-05-26 09:20:50 +02:00
eeintech
b04ad48178 Fixed test using manual exchange backend, template update 2021-05-25 11:39:04 -04:00
eeintech
93bfe4c5f1 Added 'Custom Exchange Rate' boolea setting 
Removed Fixer.io exchange rate backend
 2021-05-25 11:19:07 -04:00
eeintech
654d4ecf46 Merged @SchrodingersGat ExchangeRateHost integration work 2021-05-25 10:34:20 -04:00
Francois
949920865b
Merge pull request #3 from matmair/pr1600 
proposed changes for translation and safer backend loading
 2021-05-25 08:56:59 -05:00
Oliver
500770d1bf
Merge pull request #1608 from SchrodingersGat/rate-update-fix 
Rate update fix
 2021-05-25 14:33:38 +10:00
Oliver Walters
0a26a06909 Use INVENTREE_DEFAULT_CURRENCY as specified base currency 2021-05-25 10:46:30 +10:00
Oliver Walters
619cba6007 Currency: Use ExchangeRateHost backend by default, rather than fixer.io 
- No longer support fixer.io as it requires an API key and does not support "base" currency
 2021-05-25 10:37:53 +10:00
Oliver
817287a26c
Merge pull request #1607 from SchrodingersGat/docker-paths 
Docker: Add parent directories if they do not exist
 2021-05-25 09:48:11 +10:00
Oliver Walters
ff80c722fb Docker: Add parent directories if they do not exist 2021-05-25 09:32:21 +10:00
Matthias
b15c20611d style 2021-05-24 22:45:00 +02:00
Matthias
b4c9edcd27 bom-price ranges as pie-chart 2021-05-24 22:31:33 +02:00
Matthias
3363969c17 added in randomColor for dynamic color gen 2021-05-24 19:14:38 +02:00
Matthias
206bab137b refactor 2021-05-24 17:39:32 +02:00
Matthias
fe8e03c666 additional information for graph 2021-05-24 15:46:11 +02:00
Matthias
d5b2bfedbc re-layouting tables 2021-05-24 02:18:34 +02:00
Matthias
25681fb805 style 2021-05-24 01:30:37 +02:00
Matthias
84d71d928f removing new stuff in pricing modal 2021-05-24 01:14:15 +02:00
Matthias
7c18ebbbe4 creating new tab 2021-05-24 01:13:46 +02:00
Matthias
b803fbae72 remofing setting 2021-05-24 00:18:04 +02:00
Oliver
2d61e6fc5d
Merge pull request #1605 from SchrodingersGat/exchange-rates 
Add backend for exchangerate.host
 2021-05-23 21:35:15 +10:00
Oliver Walters
65aa468168 Add backend for exchangerate.host 2021-05-23 21:14:43 +10:00
Matthias
1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-05-23 02:31:07 +02:00
Matthias
3c5bb048a1 renaming a few parts 2021-05-22 15:39:54 +02:00
Matthias
b1b974a1f6 safer check if fixer-backend is used 2021-05-22 14:55:41 +02:00
Matthias
4503f23ae4 beeing safe with wrong / unknown setttings 2021-05-22 14:55:05 +02:00
Matthias
53ce848145 better translation 2021-05-22 14:48:56 +02:00
Oliver
098b9b7597
Merge pull request #1602 from SchrodingersGat/api-increment 
Bump API version to 3
 2021-05-22 21:14:18 +10:00
Oliver Walters
240ff59b30 Bump API version to 3 
- New stock item history tracking is incompatible
- Adds API info to the "about" dialog
 2021-05-22 20:56:56 +10:00
eeintech
be3f37f28f Updated default currency backend 2021-05-20 15:22:18 -04:00
eeintech
bbd95f2c70 Fixed exchange rate backend test 2021-05-20 14:52:56 -04:00
eeintech
27799b43b2 Template fix/improvement 2021-05-20 13:51:54 -04:00
eeintech
747b0554e1 Ready for review 2021-05-20 13:45:26 -04:00
eeintech
bed6a7e49c Added exchange rates form 2021-05-20 09:49:56 -04:00
eeintech
6d5b2d3227 Added 'Currencies' settings view in global settings 2021-05-19 17:06:41 -04:00
eeintech
34ded08ee7 Added InvenTreeFixerExchangeBackend class 2021-05-19 16:17:03 -04:00
eeintech
7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price 2021-05-19 13:25:13 -04:00
Oliver
6c91d067d7
Merge pull request #1598 from SchrodingersGat/fixer-currency-integration 
Fixer currency integration
 2021-05-18 22:59:14 +10:00