inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-08-02 19:52:59 +00:00
Code Activity
6,364 Commits 7 Branches 165 Tags
a2ebc15ee18c243c69c827ee50335f9b39f39bdd
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
OliverandGitHub 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
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
OliverandGitHub 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
OliverandGitHub d243356324 Merge pull request #1736 from matmair/money-update 
Money updates
 2021-07-02 08:34:20 +10: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
OliverandGitHub 8ee12abb50 Merge pull request #1734 from matmair/hide-related 
option to hide related parts
 2021-06-29 21:24:21 +10:00
Oliver 66dc058df5 Fix: New translations django.po from Crowdin 2021-06-29 09:33:54 +10:00
Oliver 29698aff78 Fix: New translations django.po from Crowdin 2021-06-29 09:33:53 +10:00
Oliver 674a2580dc Fix: New translations django.po from Crowdin 2021-06-29 09:33:52 +10:00
Oliver 0938e148cb Fix: New translations django.po from Crowdin 2021-06-29 09:33:50 +10:00
Oliver b88ce19adb Fix: New translations django.po from Crowdin 2021-06-29 09:33:49 +10:00
Oliver 9ddde282c9 Fix: New translations django.po from Crowdin 2021-06-29 09:33:48 +10:00
Oliver 06fe26f210 Fix: New translations django.po from Crowdin 2021-06-29 09:33:46 +10:00
Oliver 18d0435ff1 Fix: New translations django.po from Crowdin 2021-06-29 09:33:45 +10:00
Oliver 20818d71fd Fix: New translations django.po from Crowdin 2021-06-29 09:33:44 +10:00
OliverandGitHub 4eef3c99bc Merge pull request #1731 from matmair/allocated-sort-qty 
sortable OrderAllocationTable
 2021-06-29 09:31:55 +10:00
OliverandGitHub ce731db203 Merge pull request #1729 from SchrodingersGat/api-bug-fix 
Adds unit tests for HTML API endpoints
 2021-06-28 21:23:36 +10:00
Oliver f0f6c7d186 Add a comment 2021-06-28 21:09:48 +10:00
Oliver 4dbd770f2d Fixed (I think?) 2021-06-28 21:08:50 +10:00
Oliver 3c1f0637dc Adds unit tests for HTML API endpoints 2021-06-28 20:42:37 +10:00
Oliver 5bbaae14c6 Fix: New translations django.po from Crowdin 2021-06-28 09:18:30 +10:00
Oliver 0fd6a327e4 Fix: New translations django.po from Crowdin 2021-06-28 09:18:28 +10:00
Oliver 2a823d7e9a Fix: New translations django.po from Crowdin 2021-06-28 09:18:27 +10:00
Oliver 31e7d4282e Fix: New translations django.po from Crowdin 2021-06-28 09:18:26 +10:00
Oliver fd4b5b8657 Fix: New translations django.po from Crowdin 2021-06-28 09:18:25 +10:00
Oliver d3d3d93bab Fix: New translations django.po from Crowdin 2021-06-28 09:18:24 +10:00
Oliver 1f25b2f1e2 Fix: New translations django.po from Crowdin 2021-06-28 09:18:22 +10:00
Oliver ff2094d1d8 Fix: New translations django.po from Crowdin 2021-06-28 09:18:21 +10:00
Oliver 5f0de34c12 Fix: New translations django.po from Crowdin 2021-06-28 09:18:20 +10:00
OliverandGitHub b5086ab731 Merge pull request #1726 from matmair/bom-pricing 
Bom pricing
 2021-06-28 09:15:52 +10:00
OliverandGitHub 604c136b00 Update version.py 2021-06-27 21:00:01 +10:00
OliverandGitHub 786e994e19 Update version.py 
0.2.4
 2021-06-27 20:58:24 +10:00
Oliver 4320a995df Fix: New translations django.po from Crowdin 2021-06-27 10:11:52 +10:00
Oliver f9a1700b50 Fix: New translations django.po from Crowdin 2021-06-27 10:11:51 +10:00
Oliver f175389735 Fix: New translations django.po from Crowdin 2021-06-27 10:11:49 +10:00
Oliver 2c2c5b585c Fix: New translations django.po from Crowdin 2021-06-27 10:11:48 +10:00
Oliver ab72e39d05 Fix: New translations django.po from Crowdin 2021-06-27 10:11:47 +10:00
Oliver a994b35029 Fix: New translations django.po from Crowdin 2021-06-27 10:11:45 +10:00
Oliver f9215e8e59 Fix: New translations django.po from Crowdin 2021-06-27 10:11:44 +10:00
Oliver 146cf61be3 Fix: New translations django.po from Crowdin 2021-06-27 10:11:43 +10:00
Oliver 3134a91a32 Fix: New translations django.po from Crowdin 2021-06-27 10:11:42 +10:00
OliverandGitHub 42ed95c936 Merge pull request #1588 from matmair/part-import 
Part import
 2021-06-27 09:24:10 +10:00
OliverandGitHub 9e720ea620 Merge pull request #1700 from SchrodingersGat/api-default-values 
Unit testing for default values
 2021-06-27 09:01:01 +10:00
Oliver Walters 34a374ce9a Add try/except around callable default 2021-06-27 01:18:09 +10:00
Oliver Walters 0cc999410b More unit test fixes 2021-06-27 01:03:54 +10:00
Oliver Walters 7505d7b3c5 Unit test fixes 2021-06-27 00:47:12 +10:00
Oliver Walters d3e9803fd4 Remove debug statement 2021-06-27 00:25:49 +10:00
Oliver Walters 232899e0c4 Simpler implementation 2021-06-27 00:25:23 +10:00
Oliver Walters 8913b74f41 Typo fixes 2021-06-27 00:12:10 +10:00
Oliver Walters ae1a1e139f Further fixes for default API values 
- Account for callable defaults
- Extra check in is_valid()
 2021-06-27 00:01:40 +10:00
Oliver a0390f0821 PEP style fixes 2021-06-26 21:14:47 +10:00