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

6329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
7b8d056d19 updated translation base 2021-07-02 22:41:45 +00:00
github-actions[bot]
5739b73fb0 updated translation base 2021-07-02 12:14:25 +00:00
Oliver
bb4a53bb81 Merge remote-tracking branch 'inventree/master' into l10 
# Conflicts:
#	InvenTree/locale/de/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/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-02 21:48:49 +10:00
Oliver
227d202e68 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-02 21:48:09 +10:00
github-actions[bot]
bd0ef6f992 updated translation base 2021-07-02 04:52:50 +00:00
Oliver
77f668b635
Merge pull request #1739 from SchrodingersGat/docker-fix 
docker: Use a specific version of alpine
 2021-07-02 14:51:45 +10:00
Oliver
fa1644ed2c python -> python3 2021-07-02 13:07:42 +10:00
Oliver
9cdc5a1fa1 Explicitly install python3-pip 2021-07-02 12:59:54 +10:00
Oliver
56c3697e34 docker: Use a specific version of alpine 2021-07-02 12:57:37 +10:00
Oliver
e39ca35eab Fix: New translations django.po from Crowdin 2021-07-02 08:38:15 +10:00
Oliver
1689c3f235 Fix: New translations django.po from Crowdin 2021-07-02 08:38:14 +10:00
Oliver
4c35dd4970 Fix: New translations django.po from Crowdin 2021-07-02 08:38:13 +10:00
Oliver
ed961c9831 Fix: New translations django.po from Crowdin 2021-07-02 08:38:11 +10:00
Oliver
9c5bfed3e2 Fix: New translations django.po from Crowdin 2021-07-02 08:38:10 +10:00
Oliver
407be57b59 Fix: New translations django.po from Crowdin 2021-07-02 08:38:09 +10:00
Oliver
5bbd7cd831 Fix: New translations django.po from Crowdin 2021-07-02 08:38:08 +10:00
Oliver
3513f9d8a3 Fix: New translations django.po from Crowdin 2021-07-02 08:38:06 +10:00
Oliver
18ff50ad40 Fix: New translations django.po from Crowdin 2021-07-02 08:38:05 +10:00
github-actions[bot]
cec15de26c updated translation base 2021-07-01 22:35:28 +00:00
Oliver
d243356324
Merge pull request #1736 from matmair/money-update 
Money updates
 2021-07-02 08:34:20 +10:00
Matthias
5aaced6e66 migration for file-based currency setting 2021-07-01 18:20:39 +02:00
Matthias
14c904c0c5 style fixes 2021-07-01 10:45:33 +02:00
Matthias
951e8910ba using functions for currency codes 2021-07-01 10:41:23 +02:00
Matthias
983255a05e naming refactor 2021-07-01 10:37:16 +02:00
Matthias
66c1e9c97d currency codes in own function 2021-07-01 10:32:07 +02:00
Matthias
3c6c9c59d6 added clean migration steps for all price fields 2021-07-01 07:11:15 +02:00
Matthias
9b7a08f50f fixed doc 2021-07-01 07:07:40 +02:00
Matthias
4d86f33e23 clean Money migrations! 2021-07-01 07:07:02 +02:00
Matthias
ea8b102897 style fix 2021-07-01 00:50:50 +02:00
Matthias
7c6a58e936 handle default in kwargs 2021-07-01 00:48:16 +02:00
Matthias
dbb9fbd9fd set default currency in field 2021-07-01 00:46:53 +02:00
Matthias
fcdefc4f83 removing default_currency in fields 2021-07-01 00:40:26 +02:00
Matthias
e2278fc261 removing lambda 2021-07-01 00:33:24 +02:00
Matthias
4b7e8c7d21 style fixes 2021-07-01 00:14:23 +02:00
Matthias
3a57093b4e replace MoneyFields with inherited classes 2021-07-01 00:13:38 +02:00
Matthias
56b23389d3 missed the settings definition 2021-06-30 23:54:56 +02:00
Matthias
4fa57aee16 changing method call to avoid circle ref 2021-06-30 23:48:43 +02:00
Matthias
2c7a4a1246 switching out BASE_CURRENCY 2021-06-30 23:38:48 +02:00
Matthias
92645d790b use setting for currency_code_default 2021-06-30 23:36:46 +02:00
Matthias
88f57a211f setting for default currency 2021-06-30 23:35:57 +02:00
Oliver
48e36bfd9b Fix: New translations django.po from Crowdin 2021-06-29 21:33:44 +10:00
Oliver
2b846169cf Fix: New translations django.po from Crowdin 2021-06-29 21:33:42 +10:00
Oliver
7f74945e7a Fix: New translations django.po from Crowdin 2021-06-29 21:33:41 +10:00
Oliver
36e3f9bc51 Fix: New translations django.po from Crowdin 2021-06-29 21:33:40 +10:00
Oliver
9c3b93830b Fix: New translations django.po from Crowdin 2021-06-29 21:33:39 +10:00
Oliver
a1f5605e12 Fix: New translations django.po from Crowdin 2021-06-29 21:33:37 +10:00
Oliver
6ec4530628 Fix: New translations django.po from Crowdin 2021-06-29 21:33:35 +10:00
Oliver
bbdd4554a6 Fix: New translations django.po from Crowdin 2021-06-29 21:33:33 +10:00
Oliver
438e7048e1 Fix: New translations django.po from Crowdin 2021-06-29 21:33:32 +10:00
github-actions[bot]
8afcd06f72 updated translation base 2021-06-29 11:25:34 +00:00