2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-10 09:18:48 +00:00

5325 Commits

Author SHA1 Message Date
Oliver
d4f30d4f4c Fix: New translations django.po from Crowdin 2021-06-07 00:38:30 +10:00
Oliver
5e98d912c2 Fix: New translations django.po from Crowdin 2021-06-07 00:38:29 +10:00
Oliver
7206930e20 Fix: New translations django.po from Crowdin 2021-06-07 00:38:28 +10:00
Oliver
989d40eafd Fix: New translations django.po from Crowdin 2021-06-07 00:38:26 +10:00
Oliver
c02ed78eb5 Fix: New translations django.po from Crowdin 2021-06-07 00:38:25 +10:00
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
github-actions[bot]
d756289efe updated translation base 2021-06-06 14:31:22 +00:00
github-actions[bot]
4f18db181d updated translation base 2021-06-06 14:14:32 +00:00
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Oliver
5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge
# 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-06-06 22:27:27 +10:00
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style
same nav sidebar distance for everything
2021-06-06 22:14:20 +10:00
06d3489ede fix: added ruleset 2021-06-05 18:06:26 +02:00
81f00753c6 style 2021-06-05 17:24:04 +02:00
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
768080f9a0 Adding internal functions to use internal prices 2021-06-05 17:06:58 +02:00
0d93c96f2a adding internal price breaks as in #1606 2021-06-05 17:01:49 +02:00
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
daf3d06cf0 added in optional matches 2021-06-05 01:19:12 +02:00
eeintech
74bd975a0b Revert back to form_list
Moved OrderMatchItemForm to forms.py
2021-06-04 13:41:07 -04:00
Oliver
3e9adec4ff Fix: New translations django.po from Crowdin 2021-06-04 03:03:42 +10:00
Oliver
6f3593220a Fix: New translations django.po from Crowdin 2021-06-04 02:08:23 +10:00
Oliver
f0a1cca914 Fix: New translations django.po from Crowdin 2021-06-03 14:40:53 +10:00
Oliver
4af74a5ba5 Fix: New translations django.po from Crowdin 2021-06-03 09:52:21 +10:00
625d868a3f fix for form_list 2021-06-03 00:29:24 +02:00
fc9e1e6770 suggested changes @eeintech 2021-06-03 00:17:29 +02:00
Oliver
2948cf5671 Fix: New translations django.po from Crowdin 2021-06-03 05:11:59 +10:00
Oliver
3b6aba7153 Fix: New translations django.po from Crowdin 2021-06-03 04:12:58 +10:00
Oliver
69ed180034 Fix: New translations django.po from Crowdin 2021-06-03 03:15:00 +10:00
Oliver
7b1bd87d84 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-06-02 22:58:34 +10:00
Oliver
7df72f09f4 Fix: New translations django.po from Crowdin 2021-06-02 09:57:53 +10:00
Oliver
56afcfa91f Fix: New translations django.po from Crowdin 2021-06-02 08:50:33 +10:00
75cdec81ae style fix 2021-06-02 00:39:38 +02:00
495babe712 Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-02 00:36:15 +02:00
3c384947b2 spaces cleanup 2021-06-02 00:26:30 +02:00
ee582a5490 fixes the problem reported by @eeintech ? 2021-06-02 00:21:01 +02:00
eeintech
ffaa6ee3a9 Fixed price break row actions after sorting 2021-06-01 14:22:00 -04:00
Oliver
61af4ca1b3 Fix: New translations django.po from Crowdin 2021-06-01 20:22:45 +10:00
Oliver
ddf1f5c5ba Fix: New translations django.po from Crowdin 2021-06-01 20:22:43 +10:00
Oliver
1a3943fd7c Fix: New translations django.po from Crowdin 2021-06-01 20:22:42 +10:00
Oliver
3df5ef5676 Fix: New translations django.po from Crowdin 2021-06-01 20:22:40 +10:00