github-actions[bot]
7543001584
updated translation base
2021-07-05 06:55:32 +00:00
Oliver
2a8f3a2918
Merge remote-tracking branch 'origin/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-05 14:03:50 +10:00
Oliver
a2ebc15ee1
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-05 14:02:45 +10:00
Oliver
6f3ff6c8e9
Fix: New translations django.po from Crowdin
2021-07-03 22:44:13 +10:00
Oliver
d1e9505acb
Fix: New translations django.po from Crowdin
2021-07-03 22:44:12 +10:00
Oliver
c84347a247
Fix: New translations django.po from Crowdin
2021-07-03 22:44:10 +10:00
Oliver
f77ec57bfb
Fix: New translations django.po from Crowdin
2021-07-03 22:44:09 +10:00
Oliver
b564c662c7
Fix: New translations django.po from Crowdin
2021-07-03 22:44:08 +10:00
Oliver
87f95c9d26
Fix: New translations django.po from Crowdin
2021-07-03 22:44:06 +10:00
Oliver
484746baf3
Fix: New translations django.po from Crowdin
2021-07-03 22:44:05 +10:00
Oliver
4aa83abdc6
Fix: New translations django.po from Crowdin
2021-07-03 22:44:04 +10:00
Oliver
84200754aa
Fix: New translations django.po from Crowdin
2021-07-03 22:44:03 +10:00
Oliver Walters
51e4a45334
Merge remote-tracking branch 'upstream/master'
2021-07-03 22:42:22 +10:00
github-actions[bot]
f44f78cd79
updated translation base
2021-07-03 12:15:33 +00:00
Oliver
20b0e399c0
Merge pull request #1716 from SchrodingersGat/drf-api-forms
...
[WIP] API Forms
2021-07-03 22:14:26 +10:00
Oliver
3cc9299b41
Refactor SOLineItemCreate view
2021-07-03 21:56:29 +10:00
Oliver
699b21f6fd
Remove broken URL
2021-07-03 21:46:08 +10:00
Oliver
889834b693
Refactor POLineItemCreate form
2021-07-03 21:43:22 +10:00
Oliver
c524f754e9
Allow null values for purchase_price and sale_price
2021-07-03 21:27:03 +10:00
Oliver
25a80d2aa7
Fix form filters
2021-07-03 21:21:32 +10:00
Oliver
8e280b6328
Increment API version
2021-07-03 20:37:50 +10:00
Oliver
2b7805e668
PEP fix
2021-07-03 20:34:30 +10:00
Oliver
8d1928f181
Typo fix
2021-07-03 20:29:23 +10:00
Oliver
ce703bf94b
Adds detail API endpoint for StcokItemTracking model
2021-07-03 20:26:33 +10:00
Oliver
5c1fddd96d
JS bug fix
2021-07-03 16:28:03 +10:00
Oliver
143622f82c
Fix: New translations django.po from Crowdin
2021-07-03 16:27:17 +10:00
Oliver
a31fad67f3
Fix: New translations django.po from Crowdin
2021-07-03 16:27:16 +10:00
Oliver
3f9f0ba805
Fix: New translations django.po from Crowdin
2021-07-03 16:27:15 +10:00
Oliver
d4bcfd8c46
Fix: New translations django.po from Crowdin
2021-07-03 16:27:14 +10:00
Oliver
681c885921
Fix: New translations django.po from Crowdin
2021-07-03 16:27:12 +10:00
Oliver
9eba4c2485
Fix: New translations django.po from Crowdin
2021-07-03 16:27:11 +10:00
Oliver
c4659a688e
Fix: New translations django.po from Crowdin
2021-07-03 16:27:10 +10:00
Oliver
f632e379dd
Fix: New translations django.po from Crowdin
2021-07-03 16:27:08 +10:00
Oliver
d16277f11f
Fix: New translations django.po from Crowdin
2021-07-03 16:27:07 +10:00
github-actions[bot]
7ad74c32b5
updated translation base
2021-07-03 06:24:34 +00:00
Oliver
45704f7a8d
Merge pull request #1747 from matmair/depleted-stock
...
Depleted stock on start page
2021-07-03 16:23:27 +10:00
Oliver
83256b1014
Refactor BomItemDelete form
2021-07-03 16:10:41 +10:00
Oliver
ba1b37fc2a
Fix: New translations django.po from Crowdin
2021-07-03 13:16:26 +10:00
Oliver
18d367b4d8
Fix: New translations django.po from Crowdin
2021-07-03 13:16:24 +10:00
Oliver
f34233b978
Fix: New translations django.po from Crowdin
2021-07-03 13:16:23 +10:00
Oliver
0c27325e74
Fix: New translations django.po from Crowdin
2021-07-03 13:16:22 +10:00
Oliver
037c5a239c
Fix: New translations django.po from Crowdin
2021-07-03 13:16:20 +10:00
Oliver
35c95732f2
Fix: New translations django.po from Crowdin
2021-07-03 13:16:19 +10:00
Oliver
2a391e1d61
Fix: New translations django.po from Crowdin
2021-07-03 13:16:18 +10:00
Oliver
d1436d154c
Fix: New translations django.po from Crowdin
2021-07-03 13:16:15 +10:00
Oliver
eb5b386009
Fix: New translations django.po from Crowdin
2021-07-03 13:16:14 +10:00
Oliver
359e92cd8e
Merge remote-tracking branch 'inventree/master' into drf-api-forms
...
# Conflicts:
# InvenTree/InvenTree/static/css/inventree.css
2021-07-03 12:59:13 +10:00
github-actions[bot]
9323a91073
updated translation base
2021-07-03 02:56:42 +00:00
Oliver
2b32f04af2
Merge pull request #1712 from matmair/one-pricing-view
...
One pricing view
2021-07-03 12:55:34 +10:00
Oliver
67a35dc879
New Crowdin updates ( #1751 )
...
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
* Fix: New translations django.po from Crowdin
2021-07-03 12:46:23 +10:00