2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-12-30 07:47:59 +00:00

Commit Graph

  • 9cc81df276 Merge branch 'inventree:master' into price-history #1482 Matthias Mair 2021-05-28 12:14:03 +02:00
  • e0bbd23d14 Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-28 17:26:14 +10:00
  • 55f5cf6cdc New Crowdin updates (#1603) Oliver 2021-05-28 17:25:42 +10:00
  • d4e8a06259 L10 merge fix (#1614) Oliver 2021-05-28 17:25:05 +10:00
  • 793638421b Merge branch 'l10' of github.com:inventree/InvenTree into l10 Oliver Walters 2021-05-28 17:19:19 +10:00
  • d9bbebddb0 Update github actions Oliver Walters 2021-05-28 13:24:18 +10:00
  • 8319e57532 updated translation base github-actions[bot] 2021-05-28 04:35:51 +00:00
  • 723a900388 Merge pull request #1613 from SchrodingersGat/actions Oliver 2021-05-28 14:34:08 +10:00
  • c1bbaf98b5 updated translation base github-actions[bot] 2021-05-28 03:27:38 +00:00
  • 4c78f88aa3 Merge pull request #1612 from SchrodingersGat/exchange-fixes Oliver 2021-05-28 13:26:14 +10:00
  • b716312438 Ignore actions for l10 branches #1613 Oliver Walters 2021-05-28 13:24:18 +10:00
  • be6e2aa276 Better exception handling #1612 Oliver Walters 2021-05-28 13:02:34 +10:00
  • 7832ccccc2 Check if database tables are ready Oliver Walters 2021-05-28 12:54:55 +10:00
  • 1b668bf920 updated translation base github-actions[bot] 2021-05-28 02:51:33 +00:00
  • 70e13e4cae Merge pull request #1581 from eeintech/bom_items_purchase_price Oliver 2021-05-28 12:50:31 +10:00
  • 0978235370 Fix? Oliver Walters 2021-05-28 12:49:50 +10:00
  • 4ddeab3330 Update exchange rates when launching the server Oliver Walters 2021-05-28 12:44:39 +10:00
  • 52fc698b51 Remove debug message Oliver Walters 2021-05-28 12:07:53 +10:00
  • cdb453b09c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price #1581 eeintech 2021-05-27 10:20:40 -04:00
  • 8181f0dafa updated translation base github-actions[bot] 2021-05-27 07:11:29 +00:00
  • 59aca2791a Merge pull request #1611 from SchrodingersGat/exchange-simplification Oliver 2021-05-27 17:10:30 +10:00
  • c71f4ed045 Add currency exchange unit tests #1611 Oliver Walters 2021-05-27 16:48:13 +10:00
  • 4520bb7447 PEP style fixes Oliver Walters 2021-05-27 16:36:26 +10:00
  • 6085478672 Simplify settings view Oliver Walters 2021-05-27 16:34:37 +10:00
  • af1904b6e4 Simplify exhange rate backend Oliver Walters 2021-05-27 15:45:38 +10:00
  • 81d2672df7 updated translation base github-actions[bot] 2021-05-27 03:25:15 +00:00
  • 62320e46d5 Merge pull request #1610 from SchrodingersGat/template-fix Oliver 2021-05-27 13:24:08 +10:00
  • 2a64e4a309 Bug fix for template #1610 Oliver Walters 2021-05-27 13:23:20 +10:00
  • 84c473ef0d updated translation base github-actions[bot] 2021-05-27 03:19:54 +00:00
  • 8501aba368 Merge pull request #1609 from SchrodingersGat/variant-convert Oliver 2021-05-27 13:18:48 +10:00
  • 4abd3524b4 Looks like py-moneyed has been updated #1609 Oliver Walters 2021-05-27 12:59:30 +10:00
  • 4df7e53bb8 Add DEFAULT_CURRENCY option Oliver Walters 2021-05-27 12:55:30 +10:00
  • c2fe5e08b4 Expand possibilities for variant conversion Oliver Walters 2021-05-27 12:35:55 +10:00
  • bf83cfb04c Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price eeintech 2021-05-26 09:28:55 -04:00
  • 9d5b90190b style + merge fix Matthias 2021-05-26 13:18:07 +02:00
  • 859a3178a4 Merge branch 'master' into part-import Matthias Mair 2021-05-26 13:08:58 +02:00
  • 79374c5dfd ajax implementation for part import Matthias 2021-05-26 13:05:20 +02:00
  • 421b0a896d AjaxView for reuse of FormViews Matthias 2021-05-26 13:04:21 +02:00
  • 002706849c enrich context with form if not set Matthias 2021-05-26 12:20:37 +02:00
  • b8764c4d6d Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-26 19:19:33 +10:00
  • 70c131dca6 updated translation base github-actions[bot] 2021-05-26 09:12:19 +00:00
  • 3a36e800c0 Merge pull request #1600 from eeintech/update_rates_manual Oliver 2021-05-26 19:10:43 +10:00
  • 4319ba16af Settings to show import-button Matthias 2021-05-26 09:20:50 +02:00
  • b04ad48178 Fixed test using manual exchange backend, template update #1600 eeintech 2021-05-25 11:39:04 -04:00
  • 93bfe4c5f1 Added 'Custom Exchange Rate' boolea setting Removed Fixer.io exchange rate backend eeintech 2021-05-25 11:19:07 -04:00
  • 654d4ecf46 Merged @SchrodingersGat ExchangeRateHost integration work eeintech 2021-05-25 10:34:20 -04:00
  • 949920865b Merge pull request #3 from matmair/pr1600 Francois 2021-05-25 08:56:59 -05:00
  • 6c62ee4548 updated translation base github-actions[bot] 2021-05-25 04:34:43 +00:00
  • 500770d1bf Merge pull request #1608 from SchrodingersGat/rate-update-fix Oliver 2021-05-25 14:33:38 +10:00
  • 0a26a06909 Use INVENTREE_DEFAULT_CURRENCY as specified base currency #1608 Oliver Walters 2021-05-25 10:46:30 +10:00
  • 619cba6007 Currency: Use ExchangeRateHost backend by default, rather than fixer.io Oliver Walters 2021-05-25 10:37:53 +10:00
  • 9740740090 Merge remote-tracking branch 'inventree/master' Oliver Walters 2021-05-25 10:32:09 +10:00
  • 9b02171681 updated translation base github-actions[bot] 2021-05-24 23:50:05 +00:00
  • 817287a26c Merge pull request #1607 from SchrodingersGat/docker-paths Oliver 2021-05-25 09:48:11 +10:00
  • ff80c722fb Docker: Add parent directories if they do not exist #1607 Oliver Walters 2021-05-25 09:32:21 +10:00
  • b15c20611d style Matthias 2021-05-24 22:45:00 +02:00
  • b4c9edcd27 bom-price ranges as pie-chart Matthias 2021-05-24 22:31:33 +02:00
  • 3363969c17 added in randomColor for dynamic color gen Matthias 2021-05-24 19:14:38 +02:00
  • 206bab137b refactor Matthias 2021-05-24 17:39:32 +02:00
  • fe8e03c666 additional information for graph Matthias 2021-05-24 15:46:11 +02:00
  • d5b2bfedbc re-layouting tables Matthias 2021-05-24 02:18:34 +02:00
  • 25681fb805 style Matthias 2021-05-24 01:30:37 +02:00
  • 84d71d928f removing new stuff in pricing modal Matthias 2021-05-24 01:14:15 +02:00
  • 7c18ebbbe4 creating new tab Matthias 2021-05-24 01:13:46 +02:00
  • b803fbae72 remofing setting Matthias 2021-05-24 00:18:04 +02:00
  • f8b5996928 updated translation base github-actions[bot] 2021-05-23 11:36:36 +00:00
  • 2d61e6fc5d Merge pull request #1605 from SchrodingersGat/exchange-rates Oliver 2021-05-23 21:35:15 +10:00
  • 65aa468168 Add backend for exchangerate.host #1605 Oliver Walters 2021-05-23 21:14:43 +10:00
  • 1da1753b23 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history Matthias 2021-05-23 02:31:07 +02:00
  • 3c5bb048a1 renaming a few parts Matthias 2021-05-22 15:39:54 +02:00
  • b1b974a1f6 safer check if fixer-backend is used Matthias 2021-05-22 14:55:41 +02:00
  • 4503f23ae4 beeing safe with wrong / unknown setttings Matthias 2021-05-22 14:55:05 +02:00
  • 53ce848145 better translation Matthias 2021-05-22 14:48:56 +02:00
  • ee79c022a1 updated translation base github-actions[bot] 2021-05-22 11:15:33 +00:00
  • 6fe33cba5e New Crowdin updates (#1597) Oliver 2021-05-22 21:14:49 +10:00
  • 098b9b7597 Merge pull request #1602 from SchrodingersGat/api-increment Oliver 2021-05-22 21:14:18 +10:00
  • 240ff59b30 Bump API version to 3 #1602 Oliver Walters 2021-05-22 20:56:56 +10:00
  • be3f37f28f Updated default currency backend eeintech 2021-05-20 15:22:18 -04:00
  • bbd95f2c70 Fixed exchange rate backend test eeintech 2021-05-20 14:52:56 -04:00
  • 27799b43b2 Template fix/improvement eeintech 2021-05-20 13:51:54 -04:00
  • 747b0554e1 Ready for review eeintech 2021-05-20 13:45:26 -04:00
  • bed6a7e49c Added exchange rates form eeintech 2021-05-20 09:49:56 -04:00
  • 6d5b2d3227 Added 'Currencies' settings view in global settings eeintech 2021-05-19 17:06:41 -04:00
  • 34ded08ee7 Added InvenTreeFixerExchangeBackend class eeintech 2021-05-19 16:17:03 -04:00
  • 7a175f13a1 Merge branch 'master' of github.com:inventree/InvenTree into bom_items_purchase_price eeintech 2021-05-19 13:25:13 -04:00
  • 9ac1c8be12 Trans merge fix (#1599) Oliver 2021-05-20 00:07:16 +10:00
  • 92db7ec27e updated translation base github-actions[bot] 2021-05-18 13:00:35 +00:00
  • 6c91d067d7 Merge pull request #1598 from SchrodingersGat/fixer-currency-integration Oliver 2021-05-18 22:59:14 +10:00
  • 4101e25680 Style fixes #1598 Oliver Walters 2021-05-18 22:41:57 +10:00
  • 663f5562e8 Schedule a daily task to update currency information Oliver Walters 2021-05-18 22:41:26 +10:00
  • 01d444279c Add setting for fixer.io API key Oliver Walters 2021-05-18 22:11:24 +10:00
  • 900f707ff9 permission added Matthias 2021-05-18 11:51:08 +02:00
  • 167eae4322 updated translation base github-actions[bot] 2021-05-18 09:35:28 +00:00
  • efe888056f Merge pull request #1596 from SchrodingersGat/banner-reworks Oliver 2021-05-18 19:34:18 +10:00
  • 20f06ab209 updated translation base github-actions[bot] 2021-05-18 09:21:48 +00:00
  • 9a42421852 restructure overrides Matthias 2021-05-18 11:20:25 +02:00
  • 013d42de7a L10 merge (#1595) Oliver 2021-05-18 19:20:24 +10:00
  • 7cd345aeb5 Change location of 'banner' messages #1596 Oliver Walters 2021-05-18 19:19:43 +10:00
  • dd56bc1fa5 setup not realy needed Matthias 2021-05-18 11:18:13 +02:00
  • a1c4662e91 Move status messages for stock item Oliver Walters 2021-05-18 19:11:37 +10:00